text:
hgbook / en / ch06-collab.xml
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565
<!-- vim: set filetype=docbkxml shiftwidth=2 autoindent expandtab tw=77 : -->
<chapter id="cha:collab">
<?dbhtml filename="collaborating-with-other-people.html"?>
<title>Collaborating with other people</title>
<para id="x_44a">As a completely decentralised tool, Mercurial doesn't impose
any policy on how people ought to work with each other. However,
if you're new to distributed revision control, it helps to have
some tools and examples in mind when you're thinking about
possible workflow models.</para>
<title>Mercurial's web interface</title>
<para id="x_44b">Mercurial has a powerful web interface that provides several
useful capabilities.</para>
<para id="x_44c">For interactive use, the web interface lets you browse a
single repository or a collection of repositories. You can view
the history of a repository, examine each change (comments and
diffs), and view the contents of each directory and file. You
can even get a view of history that gives a graphical view of
the relationships between individual changes and merges.</para>
<para id="x_44d">Also for human consumption, the web interface provides
Atom and RSS feeds of the changes in a repository. This lets you
<quote>subscribe</quote> to a repository using your favorite
feed reader, and be automatically notified of activity in that
repository as soon as it happens. I find this capability much
more convenient than the model of subscribing to a mailing list
to which notifications are sent, as it requires no additional
configuration on the part of whoever is serving the
<para id="x_44e">The web interface also lets remote users clone a repository,
pull changes from it, and (when the server is configured to
permit it) push changes back to it. Mercurial's HTTP tunneling
protocol aggressively compresses data, so that it works
efficiently even over low-bandwidth network connections.</para>
<para id="x_44f">The easiest way to get started with the web interface is to
use your web browser to visit an existing repository, such as
the master Mercurial repository at <ulink
<para id="x_450">If you're interested in providing a web interface
to your own repositories, there are several good ways to do
<para id="x_69d">The easiest and fastest way to get started in an informal
environment is to use the <command role="hg-cmd">hg
serve</command> command, which is best suited to short-term
<quote>lightweight</quote> serving. See <xref
linkend="sec:collab:serve"/> below for details of how to use
this command.</para>
<para id="x_69e">For longer-lived repositories that you'd like to
have permanently available, there are several public hosting
services available. Some are free to open source projects,
while others offer paid commercial hosting. An up-to-date list
is available at <ulink
<para id="x_6a0">If you would prefer to host your own repositories, Mercurial
has built-in support for several popular hosting technologies,
most notably CGI (Common Gateway Interface), and WSGI (Web
Services Gateway Interface). See <xref
linkend="sec:collab:cgi"/> for details of CGI and WSGI
<title>Collaboration models</title>
<para id="x_451">With a suitably flexible tool, making decisions about
workflow is much more of a social engineering challenge than a
technical one. Mercurial imposes few limitations on how you can
structure the flow of work in a project, so it's up to you and
your group to set up and live with a model that matches your own
particular needs.</para>
<title>Factors to keep in mind</title>
<para id="x_452">The most important aspect of any model that you must keep
in mind is how well it matches the needs and capabilities of
the people who will be using it. This might seem
self-evident; even so, you still can't afford to forget it for
a moment.</para>
<para id="x_453">I once put together a workflow model that seemed to make
perfect sense to me, but that caused a considerable amount of
consternation and strife within my development team. In spite
of my attempts to explain why we needed a complex set of
branches, and how changes ought to flow between them, a few
team members revolted. Even though they were smart people,
they didn't want to pay attention to the constraints we were
operating under, or face the consequences of those constraints
in the details of the model that I was advocating.</para>
<para id="x_454">Don't sweep foreseeable social or technical problems under
the rug. Whatever scheme you put into effect, you should plan
for mistakes and problem scenarios. Consider adding automated
machinery to prevent, or quickly recover from, trouble that
you can anticipate. As an example, if you intend to have a
branch with not-for-release changes in it, you'd do well to
think early about the possibility that someone might
accidentally merge those changes into a release branch. You
could avoid this particular problem by writing a hook that
prevents changes from being merged from an inappropriate
<title>Informal anarchy</title>
<para id="x_455">I wouldn't suggest an <quote>anything goes</quote>
approach as something sustainable, but it's a model that's
easy to grasp, and it works perfectly well in a few unusual
<para id="x_456">As one example, many projects have a loose-knit group of
collaborators who rarely physically meet each other. Some
groups like to overcome the isolation of working at a distance
by organizing occasional <quote>sprints</quote>. In a sprint,
a number of people get together in a single location (a
company's conference room, a hotel meeting room, that kind of
place) and spend several days more or less locked in there,
hacking intensely on a handful of projects.</para>
<para id="x_457">A sprint or a hacking session in a coffee shop are the perfect places to use the
<command role="hg-cmd">hg serve</command> command, since
<command role="hg-cmd">hg serve</command> does not require any
fancy server infrastructure. You can get started with
<command role="hg-cmd">hg serve</command> in moments, by
reading <xref linkend="sec:collab:serve"/> below. Then simply
tell the person next to you that you're running a server, send
the URL to them in an instant message, and you immediately
have a quick-turnaround way to work together. They can type
your URL into their web browser and quickly review your
changes; or they can pull a bugfix from you and verify it; or
they can clone a branch containing a new feature and try it
<para id="x_458">The charm, and the problem, with doing things
in an ad hoc fashion like this is that only people who know
about your changes, and where they are, can see them. Such an
informal approach simply doesn't scale beyond a handful
people, because each individual needs to know about
<emphasis>n</emphasis> different repositories to pull
<title>A single central repository</title>
<para id="x_459">For smaller projects migrating from a centralised revision
control tool, perhaps the easiest way to get started is to
have changes flow through a single shared central repository.
This is also the most common <quote>building block</quote> for
more ambitious workflow schemes.</para>
<para id="x_45a">Contributors start by cloning a copy of this repository.
They can pull changes from it whenever they need to, and some
(perhaps all) developers have permission to push a change back
when they're ready for other people to see it.</para>
<para id="x_45b">Under this model, it can still often make sense for people
to pull changes directly from each other, without going
through the central repository. Consider a case in which I
have a tentative bug fix, but I am worried that if I were to
publish it to the central repository, it might subsequently
break everyone else's trees as they pull it. To reduce the
potential for damage, I can ask you to clone my repository
into a temporary repository of your own and test it. This
lets us put off publishing the potentially unsafe change until
it has had a little testing.</para>
<para id="x_45c">If a team is hosting its own repository in this
kind of scenario, people will usually use the
<command>ssh</command> protocol to securely push changes to
the central repository, as documented in <xref
linkend="sec:collab:ssh"/>. It's also usual to publish a
read-only copy of the repository over HTTP, as in
<xref linkend="sec:collab:cgi"/>. Publishing over HTTP
satisfies the needs of people who don't have push access, and
those who want to use web browsers to browse the repository's
<title>A hosted central repository</title>
<para id="x_6a1">A wonderful thing about public hosting services like
<ulink url="http://bitbucket.org/">Bitbucket</ulink> is that
not only do they handle the fiddly server configuration
details, such as user accounts, authentication, and secure
wire protocols, they provide additional infrastructure to make
this model work well.</para>
<para id="x_6a2">For instance, a well-engineered hosting service will let
people clone their own copies of a repository with a single
click. This lets people work in separate spaces and share
their changes when they're ready.</para>
<para id="x_6a3">In addition, a good hosting service will let people
communicate with each other, for instance to say <quote>there
are changes ready for you to review in this
<title>Working with multiple branches</title>
<para id="x_45d">Projects of any significant size naturally tend to make
progress on several fronts simultaneously. In the case of
software, it's common for a project to go through periodic
official releases. A release might then go into
<quote>maintenance mode</quote> for a while after its first
publication; maintenance releases tend to contain only bug
fixes, not new features. In parallel with these maintenance
releases, one or more future releases may be under
development. People normally use the word
<quote>branch</quote> to refer to one of these many slightly
different directions in which development is
<para id="x_45e">Mercurial is particularly well suited to managing a number
of simultaneous, but not identical, branches. Each
<quote>development direction</quote> can live in its own
central repository, and you can merge changes from one to
another as the need arises. Because repositories are
independent of each other, unstable changes in a development
branch will never affect a stable branch unless someone
explicitly merges those changes into the stable branch.</para>
<para id="x_45f">Here's an example of how this can work in practice. Let's
say you have one <quote>main branch</quote> on a central
<para id="x_460">People clone it, make changes locally, test them, and push
them back.</para>
<para id="x_461">Once the main branch reaches a release milestone, you can
use the <command role="hg-cmd">hg tag</command> command to
give a permanent name to the milestone revision.</para>
<para id="x_462">Let's say some ongoing
development occurs on the main branch.</para>
<para id="x_463">Using the tag that was recorded at the milestone, people
who clone that repository at any time in the future can use
<command role="hg-cmd">hg update</command> to get a copy of
the working directory exactly as it was when that tagged
revision was committed.</para>
<para id="x_464">In addition, immediately after the main branch is tagged,
we can then clone the main branch on the server to a new
<quote>stable</quote> branch, also on the server.</para>
<para id="x_465">If we need to make a change to the stable
branch, we can then clone <emphasis>that</emphasis>
repository, make our changes, commit, and push our changes
back there.</para>
<para id="x_466">Because Mercurial repositories are independent, and
Mercurial doesn't move changes around automatically, the
stable and main branches are <emphasis>isolated</emphasis>
from each other. The changes that we made on the main branch
don't <quote>leak</quote> to the stable branch, and vice
<para id="x_467">We'll often want all of our bugfixes on the stable
branch to show up on the main branch, too. Rather than
rewrite a bugfix on the main branch, we can simply pull and
merge changes from the stable to the main branch, and
Mercurial will bring those bugfixes in for us.</para>
<para id="x_468">The main branch will still contain changes that
are not on the stable branch, but it will also contain all of
the bugfixes from the stable branch. The stable branch
remains unaffected by these changes, since changes are only
flowing from the stable to the main branch, and not the other
<title>Feature branches</title>
<para id="x_469">For larger projects, an effective way to manage change is
to break up a team into smaller groups. Each group has a
shared branch of its own, cloned from a single
<quote>master</quote> branch used by the entire project.
People working on an individual branch are typically quite
isolated from developments on other branches.</para>
<figure id="fig:collab:feature-branches">
<title>Feature branches</title>
<imageobject><imagedata width="100%" fileref="figs/feature-branches.png"/></imageobject>
<textobject><phrase>XXX add text</phrase></textobject>
<para id="x_46b">When a particular feature is deemed to be in suitable
shape, someone on that feature team pulls and merges from the
master branch into the feature branch, then pushes back up to
the master branch.</para>
<title>The release train</title>
<para id="x_46c">Some projects are organized on a <quote>train</quote>
basis: a release is scheduled to happen every few months, and
whatever features are ready when the <quote>train</quote> is
ready to leave are allowed in.</para>
<para id="x_46d">This model resembles working with feature branches. The
difference is that when a feature branch misses a train,
someone on the feature team pulls and merges the changes that
went out on that train release into the feature branch, and
the team continues its work on top of that release so that
their feature can make the next release.</para>
<title>The Linux kernel model</title>
<para id="x_46e">The development of the Linux kernel has a shallow
hierarchical structure, surrounded by a cloud of apparent
chaos. Because most Linux developers use
<command>git</command>, a distributed revision control tool
with capabilities similar to Mercurial, it's useful to
describe the way work flows in that environment; if you like
the ideas, the approach translates well across tools.</para>
<para id="x_46f">At the center of the community sits Linus Torvalds, the
creator of Linux. He publishes a single source repository
that is considered the <quote>authoritative</quote> current
tree by the entire developer community. Anyone can clone
Linus's tree, but he is very choosy about whose trees he pulls
<para id="x_470">Linus has a number of <quote>trusted lieutenants</quote>.
As a general rule, he pulls whatever changes they publish, in
most cases without even reviewing those changes. Some of
those lieutenants are generally agreed to be
<quote>maintainers</quote>, responsible for specific
subsystems within the kernel. If a random kernel hacker wants
to make a change to a subsystem that they want to end up in
Linus's tree, they must find out who the subsystem's
maintainer is, and ask that maintainer to take their change.
If the maintainer reviews their changes and agrees to take
them, they'll pass them along to Linus in due course.</para>
<para id="x_471">Individual lieutenants have their own approaches to
reviewing, accepting, and publishing changes; and for deciding
when to feed them to Linus. In addition, there are several
well known branches that people use for different purposes.
For example, a few people maintain <quote>stable</quote>
repositories of older versions of the kernel, to which they
apply critical fixes as needed. Some maintainers publish
multiple trees: one for experimental changes; one for changes
that they are about to feed upstream; and so on. Others just
publish a single tree.</para>
<para id="x_472">This model has two notable features. The first is that
it's <quote>pull only</quote>. You have to ask, convince, or
beg another developer to take a change from you, because there
are almost no trees to which more than one person can push,
and there's no way to push changes into a tree that someone
else controls.</para>
<para id="x_473">The second is that it's based on reputation and acclaim.
If you're an unknown, Linus will probably ignore changes from
you without even responding. But a subsystem maintainer will
probably review them, and will likely take them if they pass
their criteria for suitability. The more <quote>good</quote>
changes you contribute to a maintainer, the more likely they
are to trust your judgment and accept your changes. If you're
well-known and maintain a long-lived branch for something
Linus hasn't yet accepted, people with similar interests may
pull your changes regularly to keep up with your work.</para>
<para id="x_474">Reputation and acclaim don't necessarily cross subsystem
or <quote>people</quote> boundaries. If you're a respected
but specialised storage hacker, and you try to fix a
networking bug, that change will receive a level of scrutiny
from a network maintainer comparable to a change from a
complete stranger.</para>
<para id="x_475">To people who come from more orderly project backgrounds,
the comparatively chaotic Linux kernel development process
often seems completely insane. It's subject to the whims of
individuals; people make sweeping changes whenever they deem
it appropriate; and the pace of development is astounding.
And yet Linux is a highly successful, well-regarded piece of
<title>Pull-only versus shared-push collaboration</title>
<para id="x_476">A perpetual source of heat in the open source community is
whether a development model in which people only ever pull
changes from others is <quote>better than</quote> one in which
multiple people can push changes to a shared
<para id="x_477">Typically, the backers of the shared-push model use tools
that actively enforce this approach. If you're using a
centralised revision control tool such as Subversion, there's
no way to make a choice over which model you'll use: the tool
gives you shared-push, and if you want to do anything else,
you'll have to roll your own approach on top (such as applying
a patch by hand).</para>
<para id="x_478">A good distributed revision control tool will
support both models. You and your collaborators can then
structure how you work together based on your own needs and
preferences, not on what contortions your tools force you
<title>Where collaboration meets branch management</title>
<para id="x_479">Once you and your team set up some shared
repositories and start propagating changes back and forth
between local and shared repos, you begin to face a related,
but slightly different challenge: that of managing the
multiple directions in which your team may be moving at once.
Even though this subject is intimately related to how your
team collaborates, it's dense enough to merit treatment of its
own, in <xref linkend="chap:branch"/>.</para>
<title>The technical side of sharing</title>
<para id="x_47a">The remainder of this chapter is devoted to the question of
sharing changes with your collaborators.</para>
<sect1 id="sec:collab:serve">
<title>Informal sharing with <command role="hg-cmd">hg
<para id="x_47b">Mercurial's <command role="hg-cmd">hg serve</command>
command is wonderfully suited to small, tight-knit, and
fast-paced group environments. It also provides a great way to
get a feel for using Mercurial commands over a network.</para>
<para id="x_47c">Run <command role="hg-cmd">hg serve</command> inside a
repository, and in under a second it will bring up a specialised
HTTP server; this will accept connections from any client, and
serve up data for that repository until you terminate it.
Anyone who knows the URL of the server you just started, and can
talk to your computer over the network, can then use a web
browser or Mercurial to read data from that repository. A URL
for a <command role="hg-cmd">hg serve</command> instance running
on a laptop is likely to look something like
<para id="x_47d">The <command role="hg-cmd">hg serve</command> command is
<emphasis>not</emphasis> a general-purpose web server. It can do
only two things:</para>
<listitem><para id="x_47e">Allow people to browse the history of the
repository it's serving, from their normal web
<listitem><para id="x_47f">Speak Mercurial's wire protocol, so that people
can <command role="hg-cmd">hg clone</command> or <command
role="hg-cmd">hg pull</command> changes from that
<para id="x_480">In particular, <command role="hg-cmd">hg serve</command>
won't allow remote users to <emphasis>modify</emphasis> your
repository. It's intended for read-only use.</para>
<para id="x_481">If you're getting started with Mercurial, there's nothing to
prevent you from using <command role="hg-cmd">hg serve</command>
to serve up a repository on your own computer, then use commands
like <command role="hg-cmd">hg clone</command>, <command
role="hg-cmd">hg incoming</command>, and so on to talk to that
server as if the repository was hosted remotely. This can help
you to quickly get acquainted with using commands on
network-hosted repositories.</para>
<title>A few things to keep in mind</title>
<para id="x_482">Because it provides unauthenticated read access to all
clients, you should only use <command role="hg-cmd">hg
serve</command> in an environment where you either don't
care, or have complete control over, who can access your
network and pull data from your repository.</para>
<para id="x_483">The <command role="hg-cmd">hg serve</command> command
knows nothing about any firewall software you might have
installed on your system or network. It cannot detect or
control your firewall software. If other people are unable to
talk to a running <command role="hg-cmd">hg serve</command>
instance, the second thing you should do
(<emphasis>after</emphasis> you make sure that they're using
the correct URL) is check your firewall configuration.</para>
<para id="x_484">By default, <command role="hg-cmd">hg serve</command>
listens for incoming connections on port 8000. If another
process is already listening on the port you want to use, you
can specify a different port to listen on using the <option
role="hg-opt-serve">-p</option> option.</para>
<para id="x_485">Normally, when <command role="hg-cmd">hg serve</command>
starts, it prints no output, which can be a bit unnerving. If
you'd like to confirm that it is indeed running correctly, and
find out what URL you should send to your collaborators, start
it with the <option role="hg-opt-global">-v</option>
<sect1 id="sec:collab:ssh">
<title>Using the Secure Shell (ssh) protocol</title>
<para id="x_486">You can pull and push changes securely over a network
connection using the Secure Shell (<literal>ssh</literal>)
protocol. To use this successfully, you may have to do a little
bit of configuration on the client or server sides.</para>
<para id="x_487">If you're not familiar with ssh, it's the name of
both a command and a network protocol that let you securely
communicate with another computer. To use it with Mercurial,
you'll be setting up one or more user accounts on a server so
that remote users can log in and execute commands.</para>
<para id="x_488">(If you <emphasis>are</emphasis> familiar with ssh, you'll
probably find some of the material that follows to be elementary
in nature.)</para>
<title>How to read and write ssh URLs</title>
<para id="x_489">An ssh URL tends to look like this:</para>
<listitem><para id="x_48a">The <quote><literal>ssh://</literal></quote>
part tells Mercurial to use the ssh protocol.</para>
<listitem><para id="x_48b">The <quote><literal>bos@</literal></quote>
component indicates what username to log into the server
as. You can leave this out if the remote username is the
same as your local username.</para>
<listitem><para id="x_48c">The
<quote><literal>hg.serpentine.com</literal></quote> gives
the hostname of the server to log into.</para>
<listitem><para id="x_48d">The <quote>:22</quote> identifies the port
number to connect to the server on. The default port is
22, so you only need to specify a colon and port number if
you're <emphasis>not</emphasis> using port 22.</para>
<listitem><para id="x_48e">The remainder of the URL is the local path to
the repository on the server.</para>
<para id="x_48f">There's plenty of scope for confusion with the path
component of ssh URLs, as there is no standard way for tools
to interpret it. Some programs behave differently than others
when dealing with these paths. This isn't an ideal situation,
but it's unlikely to change. Please read the following
paragraphs carefully.</para>
<para id="x_490">Mercurial treats the path to a repository on the server as
relative to the remote user's home directory. For example, if
user <literal>foo</literal> on the server has a home directory
of <filename class="directory">/home/foo</filename>, then an
ssh URL that contains a path component of <filename
class="directory">bar</filename> <emphasis>really</emphasis>
refers to the directory <filename
<para id="x_491">If you want to specify a path relative to another user's
home directory, you can use a path that starts with a tilde
character followed by the user's name (let's call them
<literal>otheruser</literal>), like this.</para>
<para id="x_492">And if you really want to specify an
<emphasis>absolute</emphasis> path on the server, begin the
path component with two slashes, as in this example.</para>
<title>Finding an ssh client for your system</title>
<para id="x_493">Almost every Unix-like system comes with OpenSSH
preinstalled. If you're using such a system, run
<literal>which ssh</literal> to find out if the
<command>ssh</command> command is installed (it's usually in
<filename class="directory">/usr/bin</filename>). In the
unlikely event that it isn't present, take a look at your
system documentation to figure out how to install it.</para>
<para id="x_494">On Windows, the TortoiseHg package is bundled
with a version of Simon Tatham's excellent
<command>plink</command> command, and you should not need to
do any further configuration.</para>
<title>Generating a key pair</title>
<para id="x_499">To avoid the need to repetitively type a
password every time you need to use your ssh client, I
recommend generating a key pair.</para>
<title>Key pairs are not mandatory</title>
<para id="x_6a4">Mercurial knows nothing about ssh authentication or key
pairs. You can, if you like, safely ignore this section and
the one that follows until you grow tired of repeatedly
typing ssh passwords.</para>
<para id="x_6a5">On a Unix-like system, the
<command>ssh-keygen</command> command will do the
<para id="x_6a6">On Windows, if you're using TortoiseHg, you may need
to download a command named <command>puttygen</command>
from <ulink
PuTTY web site</ulink> to generate a key pair. See
<command>puttygen</command> documentation</ulink> for
details of how use the command.</para>
<para id="x_49a">When you generate a key pair, it's usually
<emphasis>highly</emphasis> advisable to protect it with a
passphrase. (The only time that you might not want to do this
is when you're using the ssh protocol for automated tasks on a
secure network.)</para>
<para id="x_49b">Simply generating a key pair isn't enough, however.
You'll need to add the public key to the set of authorised
keys for whatever user you're logging in remotely as. For
servers using OpenSSH (the vast majority), this will mean
adding the public key to a list in a file called <filename
role="special">authorized_keys</filename> in their <filename
role="special" class="directory">.ssh</filename>
<para id="x_49c">On a Unix-like system, your public key will have a
<filename>.pub</filename> extension. If you're using
<command>puttygen</command> on Windows, you can save the
public key to a file of your choosing, or paste it from the
window it's displayed in straight into the <filename
role="special">authorized_keys</filename> file.</para>
<title>Using an authentication agent</title>
<para id="x_49d">An authentication agent is a daemon that stores
passphrases in memory (so it will forget passphrases if you
log out and log back in again). An ssh client will notice if
it's running, and query it for a passphrase. If there's no
authentication agent running, or the agent doesn't store the
necessary passphrase, you'll have to type your passphrase
every time Mercurial tries to communicate with a server on
your behalf (e.g. whenever you pull or push changes).</para>
<para id="x_49e">The downside of storing passphrases in an agent is that
it's possible for a well-prepared attacker to recover the
plain text of your passphrases, in some cases even if your
system has been power-cycled. You should make your own
judgment as to whether this is an acceptable risk. It
certainly saves a lot of repeated typing.</para>
<para id="x_49f">On Unix-like systems, the agent is called
<command>ssh-agent</command>, and it's often run
automatically for you when you log in. You'll need to use
the <command>ssh-add</command> command to add passphrases
to the agent's store.</para>
<para id="x_6a7">On Windows, if you're using TortoiseHg, the
<command>pageant</command> command acts as the agent. As
with <command>puttygen</command>, you'll need to <ulink
<command>pageant</command></ulink> from the PuTTY web
site and read <ulink
documentation</ulink>. The <command>pageant</command>
command adds an icon to your system tray that will let you
manage stored passphrases.</para>
<title>Configuring the server side properly</title>
<para id="x_4a0">Because ssh can be fiddly to set up if you're new to it,
a variety of things can go wrong. Add Mercurial
on top, and there's plenty more scope for head-scratching.
Most of these potential problems occur on the server side, not
the client side. The good news is that once you've gotten a
configuration working, it will usually continue to work
<para id="x_4a1">Before you try using Mercurial to talk to an ssh server,
it's best to make sure that you can use the normal
<command>ssh</command> or <command>putty</command> command to
talk to the server first. If you run into problems with using
these commands directly, Mercurial surely won't work. Worse,
it will obscure the underlying problem. Any time you want to
debug ssh-related Mercurial problems, you should drop back to
making sure that plain ssh client commands work first,
<emphasis>before</emphasis> you worry about whether there's a
problem with Mercurial.</para>
<para id="x_4a2">The first thing to be sure of on the server side is that
you can actually log in from another machine at all. If you
can't use <command>ssh</command> or <command>putty</command>
to log in, the error message you get may give you a few hints
as to what's wrong. The most common problems are as
<listitem><para id="x_4a3">If you get a <quote>connection refused</quote>
error, either there isn't an SSH daemon running on the
server at all, or it's inaccessible due to firewall
<listitem><para id="x_4a4">If you get a <quote>no route to host</quote>
error, you either have an incorrect address for the server
or a seriously locked down firewall that won't admit its
existence at all.</para>
<listitem><para id="x_4a5">If you get a <quote>permission denied</quote>
error, you may have mistyped the username on the server,
or you could have mistyped your key's passphrase or the
remote user's password.</para>
<para id="x_4a6">In summary, if you're having trouble talking to the
server's ssh daemon, first make sure that one is running at
all. On many systems it will be installed, but disabled, by
default. Once you're done with this step, you should then
check that the server's firewall is configured to allow
incoming connections on the port the ssh daemon is listening
on (usually 22). Don't worry about more exotic possibilities
for misconfiguration until you've checked these two
<para id="x_4a7">If you're using an authentication agent on the client side
to store passphrases for your keys, you ought to be able to
log into the server without being prompted for a passphrase or
a password. If you're prompted for a passphrase, there are a
few possible culprits.</para>
<listitem><para id="x_4a8">You might have forgotten to use
<command>ssh-add</command> or <command>pageant</command>
to store the passphrase.</para>
<listitem><para id="x_4a9">You might have stored the passphrase for the
wrong key.</para>
<para id="x_4aa">If you're being prompted for the remote user's password,
there are another few possible problems to check.</para>
<listitem><para id="x_4ab">Either the user's home directory or their
<filename role="special" class="directory">.ssh</filename>
directory might have excessively liberal permissions. As
a result, the ssh daemon will not trust or read their
<filename role="special">authorized_keys</filename> file.
For example, a group-writable home or <filename
role="special" class="directory">.ssh</filename>
directory will often cause this symptom.</para>
<listitem><para id="x_4ac">The user's <filename
role="special">authorized_keys</filename> file may have
a problem. If anyone other than the user owns or can write
to that file, the ssh daemon will not trust or read
<para id="x_4ad">In the ideal world, you should be able to run the
following command successfully, and it should print exactly
one line of output, the current date and time.</para>
<programlisting>ssh myserver date</programlisting>
<para id="x_4ae">If, on your server, you have login scripts that print
banners or other junk even when running non-interactive
commands like this, you should fix them before you continue,
so that they only print output if they're run interactively.
Otherwise these banners will at least clutter up Mercurial's
output. Worse, they could potentially cause problems with
running Mercurial commands remotely. Mercurial tries to
detect and ignore banners in non-interactive
<command>ssh</command> sessions, but it is not foolproof. (If
you're editing your login scripts on your server, the usual
way to see if a login script is running in an interactive
shell is to check the return code from the command
<literal>tty -s</literal>.)</para>
<para id="x_4af">Once you've verified that plain old ssh is working with
your server, the next step is to ensure that Mercurial runs on
the server. The following command should run
<programlisting>ssh myserver hg version</programlisting>
<para id="x_4b0">If you see an error message instead of normal <command
role="hg-cmd">hg version</command> output, this is usually
because you haven't installed Mercurial to <filename
class="directory">/usr/bin</filename>. Don't worry if this
is the case; you don't need to do that. But you should check
for a few possible problems.</para>
<listitem><para id="x_4b1">Is Mercurial really installed on the server at
all? I know this sounds trivial, but it's worth
<listitem><para id="x_4b2">Maybe your shell's search path (usually set
via the <envar>PATH</envar> environment variable) is
simply misconfigured.</para>
<listitem><para id="x_4b3">Perhaps your <envar>PATH</envar> environment
variable is only being set to point to the location of the
<command>hg</command> executable if the login session is
interactive. This can happen if you're setting the path
in the wrong shell login script. See your shell's
documentation for details.</para>
<listitem><para id="x_4b4">The <envar>PYTHONPATH</envar> environment
variable may need to contain the path to the Mercurial
Python modules. It might not be set at all; it could be
incorrect; or it may be set only if the login is
<para id="x_4b5">If you can run <command role="hg-cmd">hg version</command>
over an ssh connection, well done! You've got the server and
client sorted out. You should now be able to use Mercurial to
access repositories hosted by that username on that server.
If you run into problems with Mercurial and ssh at this point,
try using the <option role="hg-opt-global">--debug</option>
option to get a clearer picture of what's going on.</para>
<title>Using compression with ssh</title>
<para id="x_4b6">Mercurial does not compress data when it uses the ssh
protocol, because the ssh protocol can transparently compress
data. However, the default behavior of ssh clients is
<emphasis>not</emphasis> to request compression.</para>
<para id="x_4b7">Over any network other than a fast LAN (even a wireless
network), using compression is likely to significantly speed
up Mercurial's network operations. For example, over a WAN,
someone measured compression as reducing the amount of time
required to clone a particularly large repository from 51
minutes to 17 minutes.</para>
<para id="x_4b8">Both <command>ssh</command> and <command>plink</command>
accept a <option role="cmd-opt-ssh">-C</option> option which
turns on compression. You can easily edit your <filename
role="special">~/.hgrc</filename> to enable compression for
all of Mercurial's uses of the ssh protocol. Here is how to
do so for regular <command>ssh</command> on Unix-like systems,
for example.</para>
ssh = ssh -C</programlisting>
<para id="x_4b9">If you use <command>ssh</command> on a
Unix-like system, you can configure it to always use
compression when talking to your server. To do this, edit
your <filename role="special">.ssh/config</filename> file
(which may not yet exist), as follows.</para>
<programlisting>Host hg
Compression yes
HostName hg.example.com</programlisting>
<para id="x_4ba">This defines a hostname alias,
<literal>hg</literal>. When you use that hostname on the
<command>ssh</command> command line or in a Mercurial
<literal>ssh</literal>-protocol URL, it will cause
<command>ssh</command> to connect to
<literal>hg.example.com</literal> and use compression. This
gives you both a shorter name to type and compression, each of
which is a good thing in its own right.</para>
<sect1 id="sec:collab:cgi">
<title>Serving over HTTP using CGI</title>
<para id="x_6a8">The simplest way to host one or more repositories in a
permanent way is to use a web server and Mercurial's CGI
<para id="x_4bb">Depending on how ambitious you are, configuring Mercurial's
CGI interface can take anything from a few moments to several
<para id="x_4bc">We'll begin with the simplest of examples, and work our way
towards a more complex configuration. Even for the most basic
case, you're almost certainly going to need to read and modify
your web server's configuration.</para>
<title>High pain tolerance required</title>
<para id="x_4bd">Configuring a web server is a complex, fiddly,
and highly system-dependent activity. I can't possibly give
you instructions that will cover anything like all of the
cases you will encounter. Please use your discretion and
judgment in following the sections below. Be prepared to make
plenty of mistakes, and to spend a lot of time reading your
server's error logs.</para>
<para id="x_6a9">If you don't have a strong stomach for tweaking
configurations over and over, or a compelling need to host
your own services, you might want to try one of the public
hosting services that I mentioned earlier.</para>
<title>Web server configuration checklist</title>
<para id="x_4be">Before you continue, do take a few moments to check a few
aspects of your system's setup.</para>
<listitem><para id="x_4bf">Do you have a web server installed
at all? Mac OS X and some Linux distributions ship with
Apache, but many other systems may not have a web server
<listitem><para id="x_4c0">If you have a web server installed, is it
actually running? On most systems, even if one is
present, it will be disabled by default.</para>
<listitem><para id="x_4c1">Is your server configured to allow you to run
CGI programs in the directory where you plan to do so?
Most servers default to explicitly disabling the ability
to run CGI programs.</para>
<para id="x_4c2">If you don't have a web server installed, and don't have
substantial experience configuring Apache, you should consider
using the <literal>lighttpd</literal> web server instead of
Apache. Apache has a well-deserved reputation for baroque and
confusing configuration. While <literal>lighttpd</literal> is
less capable in some ways than Apache, most of these
capabilities are not relevant to serving Mercurial
repositories. And <literal>lighttpd</literal> is undeniably
<emphasis>much</emphasis> easier to get started with than
<title>Basic CGI configuration</title>
<para id="x_4c3">On Unix-like systems, it's common for users to have a
subdirectory named something like <filename
class="directory">public_html</filename> in their home
directory, from which they can serve up web pages. A file
named <filename>foo</filename> in this directory will be
accessible at a URL of the form
<para id="x_4c4">To get started, find the <filename
role="special">hgweb.cgi</filename> script that should be
present in your Mercurial installation. If you can't quickly
find a local copy on your system, simply download one from the
master Mercurial repository at <ulink
<para id="x_4c5">You'll need to copy this script into your <filename
class="directory">public_html</filename> directory, and
ensure that it's executable.</para>
<programlisting>cp .../hgweb.cgi ~/public_html
chmod 755 ~/public_html/hgweb.cgi</programlisting>
<para id="x_4c6">The <literal>755</literal> argument to
<command>chmod</command> is a little more general than just
making the script executable: it ensures that the script is
executable by anyone, and that <quote>group</quote> and
<quote>other</quote> write permissions are
<emphasis>not</emphasis> set. If you were to leave those
write permissions enabled, Apache's <literal>suexec</literal>
subsystem would likely refuse to execute the script. In fact,
<literal>suexec</literal> also insists that the
<emphasis>directory</emphasis> in which the script resides
must not be writable by others.</para>
<programlisting>chmod 755 ~/public_html</programlisting>
<sect3 id="sec:collab:wtf">
<title>What could <emphasis>possibly</emphasis> go
<para id="x_4c7">Once you've copied the CGI script into place,
go into a web browser, and try to open the URL
<emphasis>but</emphasis> brace yourself for instant failure.
There's a high probability that trying to visit this URL
will fail, and there are many possible reasons for this. In
fact, you're likely to stumble over almost every one of the
possible errors below, so please read carefully. The
following are all of the problems I ran into on a system
running Fedora 7, with a fresh installation of Apache, and a
user account that I created specially to perform this
<para id="x_4c8">Your web server may have per-user directories disabled.
If you're using Apache, search your config file for a
<literal>UserDir</literal> directive. If there's none
present, per-user directories will be disabled. If one
exists, but its value is <literal>disabled</literal>, then
per-user directories will be disabled. Otherwise, the
string after <literal>UserDir</literal> gives the name of
the subdirectory that Apache will look in under your home
directory, for example <filename
<para id="x_4c9">Your file access permissions may be too restrictive.
The web server must be able to traverse your home directory
and directories under your <filename
class="directory">public_html</filename> directory, and
read files under the latter too. Here's a quick recipe to
help you to make your permissions more appropriate.</para>
<programlisting>chmod 755 ~
find ~/public_html -type d -print0 | xargs -0r chmod 755
find ~/public_html -type f -print0 | xargs -0r chmod 644</programlisting>
<para id="x_4ca">The other possibility with permissions is that you might
get a completely empty window when you try to load the
script. In this case, it's likely that your access
permissions are <emphasis>too permissive</emphasis>. Apache's
<literal>suexec</literal> subsystem won't execute a script
that's group- or world-writable, for example.</para>
<para id="x_4cb">Your web server may be configured to disallow execution
of CGI programs in your per-user web directory. Here's
Apache's default per-user configuration from my Fedora
<para id="x_4cc">If you find a similar-looking
<literal>Directory</literal> group in your Apache
configuration, the directive to look at inside it is
<literal>Options</literal>. Add <literal>ExecCGI</literal>
to the end of this list if it's missing, and restart the web
<para id="x_4cd">If you find that Apache serves you the text of the CGI
script instead of executing it, you may need to either
uncomment (if already present) or add a directive like
<programlisting>AddHandler cgi-script .cgi</programlisting>
<para id="x_4ce">The next possibility is that you might be served with a
colourful Python backtrace claiming that it can't import a
<literal>mercurial</literal>-related module. This is
actually progress! The server is now capable of executing
your CGI script. This error is only likely to occur if
you're running a private installation of Mercurial, instead
of a system-wide version. Remember that the web server runs
the CGI program without any of the environment variables
that you take for granted in an interactive session. If
this error happens to you, edit your copy of <filename
role="special">hgweb.cgi</filename> and follow the
directions inside it to correctly set your
<envar>PYTHONPATH</envar> environment variable.</para>
<para id="x_4cf">Finally, you are <emphasis>certain</emphasis> to be
served with another colourful Python backtrace: this one
will complain that it can't find <filename
class="directory">/path/to/repository</filename>. Edit
your <filename role="special">hgweb.cgi</filename> script
and replace the <filename
class="directory">/path/to/repository</filename> string
with the complete path to the repository you want to serve
<para id="x_4d0">At this point, when you try to reload the page, you
should be presented with a nice HTML view of your
repository's history. Whew!</para>
<title>Configuring lighttpd</title>
<para id="x_4d1">To be exhaustive in my experiments, I tried configuring
the increasingly popular <literal>lighttpd</literal> web
server to serve the same repository as I described with
Apache above. I had already overcome all of the problems I
outlined with Apache, many of which are not server-specific.
As a result, I was fairly sure that my file and directory
permissions were good, and that my <filename
role="special">hgweb.cgi</filename> script was properly
<para id="x_4d2">Once I had Apache running, getting
<literal>lighttpd</literal> to serve the repository was a
snap (in other words, even if you're trying to use
<literal>lighttpd</literal>, you should read the Apache
section). I first had to edit the
<literal>mod_access</literal> section of its config file to
enable <literal>mod_cgi</literal> and
<literal>mod_userdir</literal>, both of which were disabled
by default on my system. I then added a few lines to the
end of the config file, to configure these modules.</para>
<programlisting>userdir.path = "public_html"
cgi.assign = (".cgi" => "" )</programlisting>
<para id="x_4d3">With this done, <literal>lighttpd</literal> ran
immediately for me. If I had configured
<literal>lighttpd</literal> before Apache, I'd almost
certainly have run into many of the same system-level
configuration problems as I did with Apache. However, I
found <literal>lighttpd</literal> to be noticeably easier to
configure than Apache, even though I've used Apache for over
a decade, and this was my first exposure to
<title>Sharing multiple repositories with one CGI script</title>
<para id="x_4d4">The <filename role="special">hgweb.cgi</filename> script
only lets you publish a single repository, which is an
annoying restriction. If you want to publish more than one
without wracking yourself with multiple copies of the same
script, each with different names, a better choice is to use
the <filename role="special">hgwebdir.cgi</filename>
<para id="x_4d5">The procedure to configure <filename
role="special">hgwebdir.cgi</filename> is only a little more
involved than for <filename
role="special">hgweb.cgi</filename>. First, you must obtain
a copy of the script. If you don't have one handy, you can
download a copy from the master Mercurial repository at <ulink
<para id="x_4d6">You'll need to copy this script into your <filename
class="directory">public_html</filename> directory, and
ensure that it's executable.</para>
<programlisting>cp .../hgwebdir.cgi ~/public_html
chmod 755 ~/public_html ~/public_html/hgwebdir.cgi</programlisting>
<para id="x_4d7">With basic configuration out of the way, try to
visit <literal>http://myhostname/~myuser/hgwebdir.cgi</literal>
in your browser. It should
display an empty list of repositories. If you get a blank
window or error message, try walking through the list of
potential problems in <xref
<para id="x_4d8">The <filename role="special">hgwebdir.cgi</filename>
script relies on an external configuration file. By default,
it searches for a file named <filename
role="special">hgweb.config</filename> in the same directory
as itself. You'll need to create this file, and make it
world-readable. The format of the file is similar to a
Windows <quote>ini</quote> file, as understood by Python's
<citation>web:configparser</citation> module.</para>
<para id="x_4d9">The easiest way to configure <filename
role="special">hgwebdir.cgi</filename> is with a section
named <literal>collections</literal>. This will automatically
publish <emphasis>every</emphasis> repository under the
directories you name. The section should look like
/my/root = /my/root</programlisting>
<para id="x_4da">Mercurial interprets this by looking at the directory name
on the <emphasis>right</emphasis> hand side of the
<quote><literal>=</literal></quote> sign; finding repositories
in that directory hierarchy; and using the text on the
<emphasis>left</emphasis> to strip off matching text from the
names it will actually list in the web interface. The
remaining component of a path after this stripping has
occurred is called a <quote>virtual path</quote>.</para>
<para id="x_4db">Given the example above, if we have a
repository whose local path is <filename
class="directory">/my/root/this/repo</filename>, the CGI
script will strip the leading <filename
class="directory">/my/root</filename> from the name, and
publish the repository with a virtual path of <filename
class="directory">this/repo</filename>. If the base URL for
our CGI script is
<literal>http://myhostname/~myuser/hgwebdir.cgi</literal>, the
complete URL for that repository will be
<para id="x_4dc">If we replace <filename
class="directory">/my/root</filename> on the left hand side
of this example with <filename
class="directory">/my</filename>, then <filename
role="special">hgwebdir.cgi</filename> will only strip off
<filename class="directory">/my</filename> from the repository
name, and will give us a virtual path of <filename
class="directory">root/this/repo</filename> instead of
<filename class="directory">this/repo</filename>.</para>
<para id="x_4dd">The <filename role="special">hgwebdir.cgi</filename>
script will recursively search each directory listed in the
<literal>collections</literal> section of its configuration
file, but it will <literal>not</literal> recurse into the
repositories it finds.</para>
<para id="x_4de">The <literal>collections</literal> mechanism makes it easy
to publish many repositories in a <quote>fire and
forget</quote> manner. You only need to set up the CGI
script and configuration file one time. Afterwards, you can
publish or unpublish a repository at any time by simply moving
it into, or out of, the directory hierarchy in which you've
configured <filename role="special">hgwebdir.cgi</filename> to
<title>Explicitly specifying which repositories to
<para id="x_4df">In addition to the <literal>collections</literal>
mechanism, the <filename
role="special">hgwebdir.cgi</filename> script allows you
to publish a specific list of repositories. To do so,
create a <literal>paths</literal> section, with contents of
the following form.</para>
repo1 = /my/path/to/some/repo
repo2 = /some/path/to/another</programlisting>
<para id="x_4e0">In this case, the virtual path (the component that will
appear in a URL) is on the left hand side of each
definition, while the path to the repository is on the
right. Notice that there does not need to be any
relationship between the virtual path you choose and the
location of a repository in your filesystem.</para>
<para id="x_4e1">If you wish, you can use both the
<literal>collections</literal> and <literal>paths</literal>
mechanisms simultaneously in a single configuration
<title>Beware duplicate virtual paths</title>
<para id="x_4e2"> If several repositories have the same
virtual path, <filename
role="special">hgwebdir.cgi</filename> will not report
an error. Instead, it will behave unpredictably.</para>
<title>Downloading source archives</title>
<para id="x_4e3">Mercurial's web interface lets users download an archive
of any revision. This archive will contain a snapshot of the
working directory as of that revision, but it will not contain
a copy of the repository data.</para>
<para id="x_4e4">By default, this feature is not enabled. To enable it,
you'll need to add an <envar
role="rc-item-web">allow_archive</envar> item to the
<literal role="rc-web">web</literal> section of your <filename
role="special">~/.hgrc</filename>; see below for details.</para>
<title>Web configuration options</title>
<para id="x_4e5">Mercurial's web interfaces (the <command role="hg-cmd">hg
serve</command> command, and the <filename
role="special">hgweb.cgi</filename> and <filename
role="special">hgwebdir.cgi</filename> scripts) have a
number of configuration options that you can set. These
belong in a section named <literal
<listitem><para id="x_4e6"><envar
role="rc-item-web">allow_archive</envar>: Determines
which (if any) archive download mechanisms Mercurial
supports. If you enable this feature, users of the web
interface will be able to download an archive of whatever
revision of a repository they are viewing. To enable the
archive feature, this item must take the form of a
sequence of words drawn from the list below.</para>
<listitem><para id="x_4e7"><literal>bz2</literal>: A
<command>tar</command> archive, compressed using
<literal>bzip2</literal> compression. This has the
best compression ratio, but uses the most CPU time on
the server.</para>
<listitem><para id="x_4e8"><literal>gz</literal>: A
<command>tar</command> archive, compressed using
<literal>gzip</literal> compression.</para>
<listitem><para id="x_4e9"><literal>zip</literal>: A
<command>zip</command> archive, compressed using LZW
compression. This format has the worst compression
ratio, but is widely used in the Windows world.</para>
<para id="x_4ea"> If you provide an empty list, or don't have an
<envar role="rc-item-web">allow_archive</envar> entry at
all, this feature will be disabled. Here is an example of
how to enable all three supported formats.</para>
allow_archive = bz2 gz zip</programlisting>
<listitem><para id="x_4eb"><envar role="rc-item-web">allowpull</envar>:
Boolean. Determines whether the web interface allows
remote users to <command role="hg-cmd">hg pull</command>
and <command role="hg-cmd">hg clone</command> this
repository over HTTP. If set to <literal>no</literal> or
<literal>false</literal>, only the
<quote>human-oriented</quote> portion of the web interface
is available.</para>
<listitem><para id="x_4ec"><envar role="rc-item-web">contact</envar>:
String. A free-form (but preferably brief) string
identifying the person or group in charge of the
repository. This often contains the name and email
address of a person or mailing list. It often makes sense
to place this entry in a repository's own <filename
role="special">.hg/hgrc</filename> file, but it can make
sense to use in a global <filename
role="special">~/.hgrc</filename> if every repository
has a single maintainer.</para>
<listitem><para id="x_4ed"><envar role="rc-item-web">maxchanges</envar>:
Integer. The default maximum number of changesets to
display in a single page of output.</para>
<listitem><para id="x_4ee"><envar role="rc-item-web">maxfiles</envar>:
Integer. The default maximum number of modified files to
display in a single page of output.</para>
<listitem><para id="x_4ef"><envar role="rc-item-web">stripes</envar>:
Integer. If the web interface displays alternating
<quote>stripes</quote> to make it easier to visually align
rows when you are looking at a table, this number controls
the number of rows in each stripe.</para>
<listitem><para id="x_4f0"><envar
role="rc-item-web">style</envar>: Controls the template
Mercurial uses to display the web interface. Mercurial
ships with several web templates.</para>
<para id="x_6aa"><literal>coal</literal> is monochromatic.</para>
<para id="x_6ab"><literal>gitweb</literal> emulates the visual
style of git's web interface.</para>
<para id="x_6ac"><literal>monoblue</literal> uses solid blues and
<para id="x_6ad"><literal>paper</literal> is the default.</para>
<para id="x_6ae"><literal>spartan</literal> was the default for a
long time.</para>
<para id="x_6af">You can
also specify a custom template of your own; see
<xref linkend="chap:template"/> for details. Here, you can
see how to enable the <literal>gitweb</literal>
style = gitweb</programlisting>
<listitem><para id="x_4f1"><envar role="rc-item-web">templates</envar>:
Path. The directory in which to search for template
files. By default, Mercurial searches in the directory in
which it was installed.</para>
<para id="x_4f2">If you are using <filename
role="special">hgwebdir.cgi</filename>, you can place a few
configuration items in a <literal role="rc-web">web</literal>
section of the <filename
role="special">hgweb.config</filename> file instead of a
<filename role="special">~/.hgrc</filename> file, for
convenience. These items are <envar
role="rc-item-web">motd</envar> and <envar
<title>Options specific to an individual repository</title>
<para id="x_4f3">A few <literal role="rc-web">web</literal> configuration
items ought to be placed in a repository's local <filename
role="special">.hg/hgrc</filename>, rather than a user's
or global <filename role="special">~/.hgrc</filename>.</para>
<listitem><para id="x_4f4"><envar
role="rc-item-web">description</envar>: String. A
free-form (but preferably brief) string that describes
the contents or purpose of the repository.</para>
<listitem><para id="x_4f5"><envar role="rc-item-web">name</envar>:
String. The name to use for the repository in the web
interface. This overrides the default name, which is
the last component of the repository's path.</para>
<title>Options specific to the <command role="hg-cmd">hg
serve</command> command</title>
<para id="x_4f6">Some of the items in the <literal
role="rc-web">web</literal> section of a <filename
role="special">~/.hgrc</filename> file are only for use
with the <command role="hg-cmd">hg serve</command>
<listitem><para id="x_4f7"><envar role="rc-item-web">accesslog</envar>:
Path. The name of a file into which to write an access
log. By default, the <command role="hg-cmd">hg
serve</command> command writes this information to
standard output, not to a file. Log entries are written
in the standard <quote>combined</quote> file format used
by almost all web servers.</para>
<listitem><para id="x_4f8"><envar role="rc-item-web">address</envar>:
String. The local address on which the server should
listen for incoming connections. By default, the server
listens on all addresses.</para>
<listitem><para id="x_4f9"><envar role="rc-item-web">errorlog</envar>:
Path. The name of a file into which to write an error
log. By default, the <command role="hg-cmd">hg
serve</command> command writes this information to
standard error, not to a file.</para>
<listitem><para id="x_4fa"><envar role="rc-item-web">ipv6</envar>:
Boolean. Whether to use the IPv6 protocol. By default,
IPv6 is not used.</para>
<listitem><para id="x_4fb"><envar role="rc-item-web">port</envar>:
Integer. The TCP port number on which the server should
listen. The default port number used is 8000.</para>
<title>Choosing the right <filename
role="special">~/.hgrc</filename> file to add <literal
role="rc-web">web</literal> items to</title>
<para id="x_4fc">It is important to remember that a web server like
Apache or <literal>lighttpd</literal> will run under a user
ID that is different to yours. CGI scripts run by your
server, such as <filename
role="special">hgweb.cgi</filename>, will usually also run
under that user ID.</para>
<para id="x_4fd">If you add <literal role="rc-web">web</literal> items to
your own personal <filename role="special">~/.hgrc</filename> file, CGI scripts won't read that
<filename role="special">~/.hgrc</filename> file. Those
settings will thus only affect the behavior of the <command
role="hg-cmd">hg serve</command> command when you run it.
To cause CGI scripts to see your settings, either create a
<filename role="special">~/.hgrc</filename> file in the
home directory of the user ID that runs your web server, or
add those settings to a system-wide <filename
role="special">hgrc</filename> file.</para>
<title>System-wide configuration</title>
<para id="x_6b0">On Unix-like systems shared by multiple users (such as a
server to which people publish changes), it often makes sense to
set up some global default behaviors, such as what theme to use
in web interfaces.</para>
<para id="x_6b1">If a file named <filename>/etc/mercurial/hgrc</filename>
exists, Mercurial will read it at startup time and apply any
configuration settings it finds in that file. It will also look
for files ending in a <literal>.rc</literal> extension in a
directory named <filename>/etc/mercurial/hgrc.d</filename>, and
apply any configuration settings it finds in each of those
<title>Making Mercurial more trusting</title>
<para id="x_6b2">One situation in which a global <filename>hgrc</filename>
can be useful is if users are pulling changes owned by other
users. By default, Mercurial will not trust most of the
configuration items in a <filename>.hg/hgrc</filename> file
inside a repository that is owned by a different user. If we
clone or pull changes from such a repository, Mercurial will
print a warning stating that it does not trust their
<para id="x_6b3">If everyone in a particular Unix group is on the same team
and <emphasis>should</emphasis> trust each other's
configuration settings, or we want to trust particular users,
we can override Mercurial's skeptical defaults by creating a
system-wide <filename>hgrc</filename> file such as the
<programlisting># Save this as e.g. /etc/mercurial/hgrc.d/trust.rc
# Trust all entries in any hgrc file owned by the "editors" or
# "www-data" groups.
groups = editors, www-data
# Trust entries in hgrc files owned by the following users.
users = apache, bobo
local variables:
sgml-parent-document: ("00book.xml" "book" "chapter")


text:
Silver-Tongued Devil
Bestselling author Jennifer Blake is at her sensual best in this sultry tale of love and hate, revenge and redemption that moves from the spicy heat of New Orleans to a lush sugar plantation on the Mississippi. . . .The Angel--He saved her life, then made her his prisoner. Now Renold Harden is demanding his due--as Angelica Carew's new husband. How easy it would be to surrender to Renold's name, his protection, his passion. But there is something unreal about his words of love, his determined seduction . . . .The Devil--Renold had conspired to wed and bed her, forcing Angelica into a hellish marriage for the sake of the dowry bestowed upon her: Bonheur, the plantation stolen from his family. His bride would pay the price for her father's greed and trickery, every day--and night--for the rest of her life . . . .Only her love could save him--Days of torment melt into nights of searing ecstasy as Angelica helplessly surrenders to the man who deceived and betrayed her. For what began as an act of vengeance becomes heedless, burning love--as the devil who ensnared her heart with duplicity dares to show her the meaning of forgiveness and the magic of forever. . . .
Please visit Help Page for Questions
regarding ISBN / ISBN-10 / ISBN10, ISBN-13 / ISBN13, EAN / EAN-13, and Amazon
Home | ISBN Directory | Affiliate
Program | Contact
Copyright © 2003-2014 AllDiscountBooks.net All rights reserved.

subset: commoncrawl


text:
SMARTPLY Oriented Strand Board (OSB) panels are designed and manufactured for use in a variety of structural and non-structural applications and environments. Great for flooring, roofing, and frame work projects, our OSB3 board is strong and moisture resistant, making it suitable for structural humid environments. OSB sheets are available with either square edges or tongue and groove which provide you with a reliable, quick and easy installation.
High quality OSB is created by compressing, under intense heat and pressure, alternating layers of wood strands coated with synthetic resin and wax. The result is a rigid, high quality structural OSB panel.
SMARTPLY FLAME RETARDANT OSB3, powered by Zeroignition, now has Euroclass C and Euroclass B* reaction to fire performance in addition to FR/FR Build performance defined by the STA's (Structural Timber Association) "Design guide to separating distances during construction" for timber frame buildings above 600m² total floor area.
Is your project fully sustainable?... Including the site hoarding? SMARTPLY SITEPROTECT: Developed specifically for use in a breadth of applications from temporary site hoarding through to a range of security installations, SITEPROTECT is a fully sustainable solution, ideal for painting and promoting your corporate colours. Take a look...


text:
Tanzania #14 — Making the Connection
Sam Morse '15 celebrates the new friendships she has found through service:
Fourteen girls strolled reluctantly into a primary school classroom. They sat around the tables nervously laughing at one another and talking amongst themselves. As we went around the circle and introduced ourselves, we slowly connected with the oldest girls at JBFC. In hopes of breaking the cultural barrier between us, we broke out into two small random groups to participate in the human knot game. After the girls successfully completed two different rounds of the game, we created a circle of trust in the back of the classroom. We generated a comfortable environment for the girls to share three attributes of themselves; by sitting knee to knee, we bonded and laughed together.
"I am a good listener," whispered one. "I am outgoing and very talkative," I said. After learning new things about one another and really opening up to each other we split off into 4 groups to make up clever skits that included leadership and problem solving.
Latisha took charge in our group and perfectly put together a thoughtful skit with humor, seriousness, and a fantastic moral lesson. "Sam, can I tell you a secret," Latisha said. "Sure," I quickly responded. "Well I kind of have a crush on Jacob, but don't tell anybody because I trust you." I nodded understandingly. We hugged before I frantically ran over to the other group of girls to spread her secret. By portraying this typical bullying situation, we taught the girls that it's important to trust their friends and keep secrets to yourself.
"Do you girls have any questions, concerns, or need advice on a situation you might be in?" No hands shot up. After giving one last big round of applause for all the girls and their thoughtfulness and trust, we hugged each one and waved 'kwaheri' (goodbye).
Travis, the guest coordinator here, observed our entire leadership session closely: "You are the quickest group ever that has really connected with the oldest girls here at JBFC." After receiving great feedback and achieving our initial goals of having all the girls participate, share, and laugh, Ali, Christie, Katherine, and I walked away with big, content smiles on our faces—knowing that we were not just any volunteer group.
Four hours later, I sat on the cool dining hall floor getting my hair braided by Imma, a 14-year-old girl that participated in the leadership class. After tying off the last braid, she wrapped me in her arms. "Maybe later we can meet up and I can tell you my story and get some advice from you," she whispered.


text:
Lawyers are a busy bunch. You've got to deal with current clients, finding new clients, litigation, paperwork, meetings,
billing, the economy, etc. On top of that, now you should be worried about your digital footprint.
PeekYou, which helps other people find your websites, social networking sites, and anything else about you online, has a list of more than 300,000 attorneys. I got an e-mail from the company with the "Top 10" prominent lawyers online. Of course, famous attorneys made the list like Ralph Nader and Harvey Levin. Number one is author Lawrence Lessig.
The list is a part of a new service by the website that ranks the attorneys' web presence.
Basically, if you dominate the Web you'll be on this list. Let's say then that you are an attorney with a huge Twitter following, you're on television, or perhaps have made the news a lot lately because you decided to step down from your Senate seat. You'll have a bigger web presence than an attorney who has a website for his practice and a private Facebook account.
Doesn't an attorney have enough to worry about without having to consider how many times your name pops up on the Internet? Is this a new strategy of attorneys and firms to increase their exposure to the general public or a certain audience?


text: The state Legislature has approved a bill to ban text messaging while driving, sending the proposal to Governor Paul LePage for his signature.After several weeks of delays, the House unanimously approved the bill on Monday, and the Senate followed suit with final approval hours later.The bill's sponsor, Senator Bill Diamond, a Windham Democrat, says Maine would become the last New England state to ban texting if the governor signs the bill.Two years ago, Maine lawmakers approved a distracted-driving law sponsored by Diamond that targeted a variety of activities, but Diamond said it didn't go far enough. The new proposal makes it a $100 fine for texting, regardless of whether it causes an accident.(The Associated Press)


text:
This is a good intermediate putter, I would recommend it to a high handicapper. It has a good look and feel. Mid to low handicappers will prefer a putter with a little more weight and will produce a consistent end over end roll.
Usual consistent performance from the White Ice #1. I'm happy with the service from Global Golf. The best.
#1 putter on tour


text:
Originally Posted by azarhal
I could try it tonight, once I get back from work.
I redit the tutorial on Very Hard and resorted to kill almost all the guards. They are a lot more aware. One well placed gun shot is enough to kill though, still take about 2-3 swords slice for melee as well, but they hit much more harder.
There is also items that turn into coins right away when you loot them as well. That is a bit unrealistic to me, but I actually didn't realize it, until I didn't see any of that stuff in my inventory.


text:
Four couples sue to overturn Indiana's ban on gay marriage
By Brendan O'Brien
(Reuters) - Four gay couples filed a federal lawsuit on Friday in an effort to halt Indiana's gay marriage ban and force the state to recognize marriages of same-sex couples who were wed elsewhere.
The suit, filed by the Indiana couples in a New Albany federal court, challenges the state's Defense of Marriage Act, saying the law is unconstitutional by denying same-sex couples the rights, privileges and responsibilities extended to opposite-sex couples.
"Indiana's discrimination towards these couples touches many aspects of married and family life, from the mundane to the profound," the complaint said.
Advocates have gained momentum in their fight to legalize gay marriage in courts across the United States where judges recently struck down restrictions in Kentucky, Virginia and Texas.
The Indiana suit was filed as a federal trial winds down in Michigan, where a lesbian couple hopes to ease restrictions that hinder same-sex couples from adoption as well as overturn that state's gay marriage ban.
Under Indiana's Defense of Marriage Act, the state does not allow gay couples to marry and does not recognize gay marriages that occur in other states.
In February, those opposed to gay marriage won a victory in the Indiana Senate where lawmakers approved a proposed state constitutional amendment that would prohibit same-sex marriage. That measure must be passed again by both chambers before it can go to the voters in 2016.
State Attorney General Greg Zoeller said in a statement that he will fight the lawsuit and defend Indiana's gay-marriage ban. Continued...


text:
This was one of our most renegade shoots ever. The whole shoot took about an hour and a half. We got word that Bonnie Li, who is one of the most talented artists out of Paris right now, was coming to stay the weekend with us. We knew that we had to plan a mini shoot around her. For this shoot we contacted different Etsy shops to pull together a look that is part fashiongrunge part Bonnie Li.
sequin Top and purple riding pants, Positive Greater Than Negative Shop, shoes, Stella McCartney
Black leather jacket, Positive Greater Than Negative Shop; Tutu Dress and Shoes Bonnie's own
Dress; Flabbergast Banana Vintage, Shoes; stylist's own
Superhero Dress, Flabbergast Banana Vintage, Bow; Bonnie's own
Vest and Striped Top; Positive Greater than Negative Shop, Shorts; Kaleidoscope Eyes; Boots by Bess
Special thanks to Kimi @ Positive Greater Than Negative, Lillian @ Flabbergast Banana, and Kaleidoscope Eyes Vintage and BONNIE LI!
Photo: Lauren M Brown
Styling: Becca Ciacchi, Cody McCook, Claudia Schwenk
Model: Bonnie Li


text:
Looking for a mousse with a wet, thick consistency
View Single Post
View Public Profile
Send a private message to ms1234
Find More Posts by ms1234
Join Date: Dec 2011
Posts: 4
Wednesday, December 21, 2011 at 02:31PM
Thank you for all the great suggestions.
It's been a busy week...so far I've tried 4 new products. 2 have been misses, but I think the other 2 will work for me once I figure out the right amount to use.
1. Lacoupe Perfect curls mousse and curl creme did not help my curls form at all and had very little hold
2. Joico Joiwhip mousse...texture of mousse is wet and thick like I wanted. I think I simply used too much on my first time as I ended up with a LOT of crunchiness
3. AG Recoil...used it in combination with the mousse, and again I think I just used way too much product as my hair was very very crunchy.
Next time, I will definitely use way less product and I think I will see the results I was hoping for!


text:
Archive Home
 VPR.net Home
With tag: vermont_technical_college
Page 1 of 1
« Previous
Next »
RSS Feed
VPR News
Vt. Tech Sees Big Energy Savings
Thursday, 01/17/13
Officials at Vermont Technical College say a school competition and a grant from IBM helped reduce the school's electric bill by more than $40,000 in one year.
VPR News
State Pitches In For Brooks House Renovation
Friday, 11/02/12
Help is on the way to rebuild a 140-year-old building damaged by fire in Brattleboro.
VPR News
A Bright Future For Brooks House
Friday, 10/26/12
Susan Keese
In Brattleboro, two dreams have moved closer to reality. One is the dream of restoring the Brooks House, an important downtown building, gutted by fire in 2011. There's also the dream of a downtown college campus that would bring students and jobs to Brattleboro's Main Street.
VPR News
Brattleboro Eyed For New College Campus
Thursday, 10/18/12
A committee of the Vermont State Colleges has picked a building in downtown Brattleboro as the site of a new campus for Community College of Vermont and Vermont Technical College.
VPR News
U.S. Labor Secretary Visiting VTC
Tuesday, 10/02/12
U.S. Labor Secretary Hilda Solis will be in Randolph Tuesday, touring a dairy farm at Vermont Technical College. She's here to highlight a training program that supports agricultural businesses.
VPR News
VTC Nets Department Of Labor Grant
Monday, 10/01/12
Vermont Technical College, in Randolph, is getting $3.4 million from the U.S. Department of Labor. The money will support training programs in agriculture, food production, waste disposal and energy production.
VPR News
VTC To Begin Aviation BS Degree
Friday, 02/03/12
The Vermont Technical College is going to begin offering a four-year bachelor of science program in aviation called Professional Pilot Technology.
VPR News
Vermont Technical College Launches Biomass Project
Friday, 02/19/10
A new biomass project will help heat the Randolph campus of the Vermont Technical College and give students hands-on experience in the growing field of renewable energy.
VPR News
Interview: VTC students learn about coffee production
Thursday, 06/11/09
Mitch Wertlieb
A group of students from Vermont Technical College recently returned from Costa Rica, visiting as part of a citizen science team who worked with six coffee farmers there, trying to form a cooperative to sell organic coffee.
 MP3 Available
Page 1 of 1
« Previous
Next »
Supported By
Become an Underwriter
Find an Underwiter
Vermont Public Radio | 365 Troy Avenue Colchester, VT 05446 | (802) 655-9451 © 2013 Vermont Public Radio


text:
Welcome back to Best Comic Covers of the Week, where the staff of Comic Vine picks out some of the best covers and presents them to you in a nice little package. We've had a busy few weeks here at CV and because of our con schedule, we weren't able to get this up last week. However, we found the courage and strength to bring this to you during C2E2. Let's get down to business.
ETERNAL WARRIOR #8 by Lewis Larosa
First up is ETERNAL WARRIOR #8 by Lewis Larosa. This cover not only looks really cool but it has a very interesting perspective to it. Just because he's old that doesn't mean Gilad doesn't have some fight left in him.
AVENGERS UNDERCOVER #3 by Francesco Mattina
Next on our list is AVENGERS UNDERCOVER #3 by Francesco Mattina. This is a really stunning issue and says a lot about what the heroes truly want in this series: Arcade dead.
DAREDEVIL #2 by Chris Samnee
Here is DAREDEVIL #2 by Chris Samnee. The way this page is laid out looks great and the hands reaching towards Daredevil gives is a spooky look.
7TH SWORD #1 by Andrew Robinson
7TH SWORD #1 by Andrew Robinson is the next cover on our list. The cover layout is very striking and your eye draws towards the top and slowly falls down the page.
MIND MGMT #21 by Matt Kindt
Finally, we have MIND MGMT #21 by Matt Kindt. This cover is simple but really grabs the reader's attention.The simple work creates this very stunning cover.
That's it for another weekly adventure with the best comic book covers of the week, we'll see you guys next week with a whole new batch of covers. Do you have a cover you simply love that we missed? Let us know in the comment section below! Also, make sure to check us out on Twitter to get your Twit-picks in for next week using #CVCovers, which we did not get a chance to do this week.
Mat "Inferiorego" Elfring is a writer, twitterer, podcaster, and enjoys hugs from pugs.


text:
"I ordered these and love them!! I bought some small brown bag paper envelopes and they go great on the back of the envelope. If you are considering these, I'd say go for it! Delivery was shorter than predicted also!!"
"Love these chalkboard address labels. The nod to chevron is a perfect touch. Love how customizable these are with fonts and sizes. Bonus: Tiny Prints' excellent customer service when I had trouble applying a code. Thank you!"
Copyright © 2004-2017 Shutterfly, Inc | Tiny Prints | Terms of Use. Designated trademarks and brands are the property of their respective owners.


text:
Help A Dad With His Son That Won't Sleep
We're starting to get into a pattern here of my son going to sleep, only to wake up crying to get us up, because he wants to play at 2:30 in the morning. I need sleep. Help!
I don't know if it's my fault giving him a nap in the afternoon, because in the past I have put him down for about an hour and a half to two hours, then at night he goes down to sleep and lasts through the night.
Is it because he's getting more excited about his toys? He loves pushing around his huge dump truck and playing with his tricycle too, so maybe if he sees it in his room, it would cause him to break out of his crib and start playing?
If you're a parent who's been through this saying, "been there, done that" I would appreciate any help with your suggestions below, because I appreciate sleep too. Thanks in advance!
What should I do?


text:
|Patriots Look Poised For Another Super Bowl Run
|Bruins Trade For Drew Stafford
|Black and Gold Bruins Turn Yellow On Parade Day
|Inconsistency Will Continue For Bruins Unless A Change Is Made
Two weeks remain in the season, and the final push is in full swing. Only one team has officially clinched a playoff spot so far, so there's still plenty of room to make a move. Four divisions still have three teams officially alive. Teams are really on edge trying to keep or steal playoff spots, so let's look at what would happen if the playoffs started as of Thursday, September 20 at 6:30pm:
The Nationals are now in a dogfight with Cincinnati, leading the Reds by a single percentage point. It appears the Nats have yet to establish a firm identity after shutting down Stephen Strasburg, and that could cost them if they don't, and fast.
The Giants have picked up their game, winning their last three, but Cincinnati has won their last four. These two teams have mirrored each other pretty closely as of late, but Cincinnati is on the cusp of taking the #1 seed, so they still have a lot to fight for, giving them a mental edge.
The Cardinals have gotten back on track, winning their last four, but three were at home against the Astros. The Braves are 5-1 in the last week, including a sweep of Washington, so St. Louis still has a ways to go.
Texas has a comfortable three-game lead on the AL's top spot, and still has plenty of healthy talent on the roster. They've been a little hit-or-miss lately, but unless teams still take them completely serious, Texas will roll over them.
Four straight wins have the Yankees still on top of the AL East, and they needed every one of those wins. The White Sox recently ended a five-game winning streak of their own in Kansas City, which makes this series interesting. Still, the Yankees will need their best guys to be back at 100% to make it far in the playoffs and keep up this momentum, and while they're getting there, they could stand to regain more health.
The Orioles have won four straight to stay half a game behind New York, and are now tied with Oakland. Oakland is looking to regain some of their momentum recently lost, but Baltimore seems to have found it.
Tags: Atlanta Braves, Baltimore Orioles, Chicago White Sox, Cincinnati Reds, MLB Playoffs, New York Yankees, Oakland Athletics, San Francisco Giants, St. Louis Cardinals, Texas Rangers, Washington Nationals


text:
Watsonville police respond to shooting on Grant Street
WATSONVILLE, Calif. - Watsonville police are responding to a victim of a gunshot wound on Grant Street, not far from the Salvation Army.
Around 4:50 p.m., police sent out a Nixle alert warning residents of police activity in the area of Union Street, Marchant Street and Grant Street. They're asking people to avoid that area while they investigate.
Watsonville police responded to reports of a fight and when they arrived, they found one victim of a gunshot wound to the upper body in front of a home at 140 Grant Street.
Witnesses say they heard two gun shots.
Police are investigating it as possibly gang-related. No suspect information is available at this time.


text: NEW YORK, June 27, 2013 /PRNewswire/ -- Art imitates life in Stuart Weitzman's Fall 2013 ad campaign, as fashion icon Kate Moss serves as both the face and the muse. The styling of the dramatic black and white images, photographed by Mario Testino, aims to mirror Moss's effortless signature look. (Photo: http://photos.prnewswire.com/prnh/20130627/NY39566-a ) (Photo: http://photos.prnewswire.com/prnh/20130627/NY39566-b ) (Photo: http://photos.prnewswire.com/prnh/20130627/NY39566-c ) While Moss's style has been inspirational and aspirational for years, her edgy aesthetic resonates now more than ever as fall runways teemed with 90s-inspired looks reminiscent of her personal style. Since Moss was an originator of this aesthetic, Stuart Weitzman decided to use her "perfectly imperfect look" as the creative inspiration for the campaign. From her trademark shaggy furs, to fitted blazers, to cut-off shorts, to hip all-black ensembles, Moss's must-haves are perfect pairings for Weitzman's trademark boots. The fall campaign showcases in-demand trends, including thigh-highs, lace-up combat boots and menswear-inspired Chelsea boots. Also featured is the brand's iconic 5050 over-the-knee boot, which is celebrating its 20 th anniversary this Fall season. "I enjoyed working with Stuart Weitzman again this season to showcase his fabulous fall boots," said Kate Moss. "Shooting the campaign with Mario is always fun and, with such a great team, it really doesn't feel like work." Moss, who debuted as the face of the Stuart Weitzman brand in the Spring 2013 ad campaign, was chosen because of her unparalleled status as a global style icon. Moss exudes a sense of style and confidence that every woman aspires to emulate. Women want to dress like her, look like her and walk in her shoes ... and now, she's walking in Stuart Weitzman's. In the world of Stuart Weitzman, "sexy" means being comfortable and confident in your own skin, and the campaign captures this essence in a natural, classic, chic way while clearly showcasing the new season's lust-worthy boot styles. The international advertising campaign will launch in September in the United States, Italy, France, Canada, Dubai, Germany, Spain and Asia. Outdoor advertising (billboards and kiosks) will run in Los Angeles, New York, Miami, Milan and Paris. Behind-the-scenes video and additional creative content will be featured on www.stuartweitzman.com and in Stuart Weitzman boutiques worldwide. A short film featuring Kate Moss in an engaging omni-channel campaign will also launch in conjunction with advertising to maximize social activation worldwide. Stuart Weitzman is a division of The Jones Group Inc. (NYSE:JNY)


text:
guys i want to buy a good pc urgently. but not sure which one to buy. which one is better dell workstation or assembled one? or if i am buying assembled one can some one provide me configuration pls? my budget is Rs. 50,000 i.e. around $1000 USD
If you're budget is around $1,000 which is kind of low for a workstation, you may just be better off buying a Dell. While I'm sure you'll get more bang for your buck with a custom built, it may not be worth the time of researching, ordering, building, etc.
oh ok, thanks Mark
If it's urgent, definitely just buy one. Assembling one does take a lot of time like Mark said, plus if you buy parts from different places, you'll have to wait for shipping at different times. Installing a OS, BIOS , and all that jazz isn't that fun either if you urgently need a new PC.
Thanks Vinh What you guys think about http://www.dell.com/in/business/p/precision-t1600/pd this one?
I am gonna use it for, after effects templates, keying & compositing of 4k footages, non-linear editing and lil bit 3D work. Should i go for this?
first thing never buy an assembled computer but buy a customized work station. although in india assembled one is cheap and branded one are costlier but computer is not a pack of cigarette which buy everyday. If you have good budget buy mac


text:
Canadians Max Parrot, Mark McMorris take gold and silver at X Games slopestyle
Maxence Parrot of Bromont, Quebec, celebrates his gold medal in the Snowboard Slopestyle world cup final Sunday, January 19, 2014 in Stoneham, Que. (THE CANADIAN PRESS/Jacques Boissinot)
The Canadian Press
Published Saturday, January 25, 2014 4:52PM EST
ASPEN, Colo. -- Maxence Parrot of Bromont, Que., reached the top of the podium for the second time in as many days at the X Games, winning gold in snowboard slopestyle Saturday.
Parrot, who captured his first X Games gold medal Friday night in the big air competition, scored 96.33 points to edge defending X Games champion Mark McMorris of Regina.
McMorris crashed onto a rail in his third and final run of the day, but finished second with 95.66 points. Stale Sandbech of Norway placed third with 90.00.
All three medallists will compete in Sochi next month when snowboard slopestyle makes its Olympic debut.
Sebastien Toutant of L'Assomption, Que., who will also represent Canada in Russia, placed seventh.
In the women's slopestyle final, Spencer O'Brien of Courtenay, B.C., finished third with 94.00 points.
Norway's Silje Norendal won the gold medal with 96.00 while American Jamie Anderson took silver with 95.66.


text:
Mountain West Launches Social Rewards Program
Aug. 31, 2012
|Related Links
Developed in partnership with Lodestone Sports, the leader in social media programs for college sports, MW fans earn points for participating in social media activities through the Mountain West's official social media channels. Activities including liking, sharing and commenting on Facebook posts, tweeting hashtags and retweeting, posting photos, and taking part in in-game social media conversations.
The MW Social Rewards program tracks overall point leaders and individual school leaders for every Mountain West member institution. Fans can compete against their fellow fans from across the Mountain West and win prizes.
How to Play
- Visit MWSocialRewards.com and click on the "Sign Up" button to create a profile.
- Connect your Facebook, Twitter and Foursquare accounts to your MW Social Rewards profile.
- Engage with Mountain West social media by linking, sharing, retweeting, etc.!
Grand prizes include a trip for two to the 2013 Mountain West Basketball Championships and an iPad. The highest point earner from each MW institution will win an autographed football from the head coach of their favorite team. In the coming months, a redemption store will be available for fans to cash in points for MW and institutional merchandise.
As part of the Mountain West Social Rewards program, the Conference is kicking off its Fourth Annual Football Fan Favorite Photo Contest that offers Facebook users the chance to win weekly prizes and bowl game tickets! To enter the contest, like the Mountain West on Facebook at Facebook.com/MountainWestConference and submit your favorite game day photos on the "Fan of the Week" tab by 5 p.m. MT on Sundays. Send in pictures of your pre-game tailgate parties and backyard barbeques with your friends, photos with your favorite MW mascot, candids of the kids, or pics of the best dressed fans. You're the fans, so you decide!
Finalists each week will be posted to the official MW Facebook page, and fans will have until Noon MT every Friday to vote for their favorite. The photo with the most votes every week will be announced each Friday via TheMWC.com and Facebook.com/MountainWestConference. Each week's favorite fan photo will win a Mountain West prize pack, and at the end of the 2012 college football regular season, will go head-to-head against all weekly winners for the grand prize: two tickets to an MW bowl game of their choice.*
To start earning points now, join the conversation and the fun at MWSocialRewards.com. Plus, don't forget to engage on the Mountain West's social media channels:
MW Twitter Hashtags: #MW | #MWFB | #MWBB
Facebook.com/MountainWestConference | YouTube.com/MountainWestConf
*Excluding the BCS National Championship game should an MW team earn a berth