Thomas Arendsen Hein <thomas@intevation.de> [Sat, 23 Jun 2007 12:05:00 +0200] rev 4683
Merge with main
Matt Mackall <mpm@selenic.com> [Fri, 22 Jun 2007 17:29:49 -0500] rev 4682
rollback: update help for issue316
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 22 Jun 2007 20:44:40 -0300] rev 4681
merge: fix small bug with a failed merge across a rename
If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy
f to fd, and util.set_exec wouldn't find the file.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 22 Jun 2007 19:43:29 -0300] rev 4680
transplant: fix locking order
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 22 Jun 2007 19:06:04 -0300] rev 4679
git patches: correct handling of filenames with spaces
Add a trailing TAB to the "--- filename" lines if there's a space
in the file name. This allows patch(1) to work correctly. The
same is done for diff --nodates.
This was originally suggested by Andrei Vermel, but at the time
I thought git was doing something different.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 22 Jun 2007 14:32:54 -0300] rev 4678
Work around urllib2 digest auth bug with Python < 2.5
This should fix issue570.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 21 Jun 2007 23:42:06 -0300] rev 4677
dirstate.status: if a file is marked as copied, consider it modified
After a "hg copy --force --after somefile cleanfile", cleanfile
shouldn't be considered clean anymore.
Matt Mackall <mpm@selenic.com> [Thu, 21 Jun 2007 18:05:14 -0500] rev 4676
Merge with Eric Hopper
Eric Hopper <hopper@omnifarious.org> [Thu, 21 Jun 2007 10:40:09 -0700] rev 4675
Change branches to sort 'active' branches first, and add an option to show only active branches.
Matt Mackall <mpm@selenic.com> [Thu, 21 Jun 2007 18:02:03 -0500] rev 4674
merge: warn user about divergent renames
Patrick Mezard <pmezard@gmail.com> [Thu, 21 Jun 2007 22:19:41 +0200] rev 4673
Merge with crew
Marcos Chaves <marcos.nospam@gmail.com> [Thu, 21 Jun 2007 21:58:18 +0200] rev 4672
Handle CTRL+C in serve under Windows.
Matt Mackall <mpm@selenic.com> [Thu, 21 Jun 2007 13:09:01 -0500] rev 4671
identify: take a path to a remote repo
Rather than using -R, we take a path as an argument. This lets us use
url#branch syntaxes that may be in hgrc.
Matt Mackall <mpm@selenic.com> [Thu, 21 Jun 2007 13:09:00 -0500] rev 4670
dispatch: parse local hgrc for paths
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 21 Jun 2007 19:38:44 +0200] rev 4669
hgweb_mod.archive(): Use 'key' instead of builtin 'id'.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 21 Jun 2007 19:24:27 +0200] rev 4668
Remove useless variable assignments in util.opener.
The original idea might have been to prevent circular references, but
as this assignment would have created another reference, this makes
no difference.
Matt Mackall <mpm@selenic.com> [Thu, 21 Jun 2007 11:54:16 -0500] rev 4667
identify: work with remote repos
Matt Mackall <mpm@selenic.com> [Thu, 21 Jun 2007 11:54:13 -0500] rev 4666
identify: add support for output flags
Matt Mackall <mpm@selenic.com> [Thu, 21 Jun 2007 11:54:11 -0500] rev 4665
identify: accept a revision argument
Matt Mackall <mpm@selenic.com> [Thu, 21 Jun 2007 11:42:39 -0500] rev 4664
identify: use contexts
Matt Mackall <mpm@selenic.com> [Thu, 21 Jun 2007 11:42:39 -0500] rev 4663
context: add tags() method
Matt Mackall <mpm@selenic.com> [Thu, 21 Jun 2007 11:42:39 -0500] rev 4662
identify: show nullid for empty repo
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 21 Jun 2007 10:00:59 +0200] rev 4661
Backed out changeset cfa477946181824f4c769580ebf59710090ba08a
Only printenv was changed, not the actual execution of hooks.
And not setting an empty value might cause problems on platforms
which can't always remove variables from the environment.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 21 Jun 2007 09:45:33 +0200] rev 4660
Adjust note about variables not being set for empty values.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 21 Jun 2007 09:25:49 +0200] rev 4659
Kill trailing spaces
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 21 Jun 2007 00:34:14 -0300] rev 4658
mq: test that qpush cleans things up when it fails
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 21 Jun 2007 00:34:14 -0300] rev 4657
dirstate.invalidate: clear dirty flag
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 21 Jun 2007 00:34:14 -0300] rev 4656
dirstate: fix typo
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 21 Jun 2007 00:34:14 -0300] rev 4655
update the output of test-help and test-globalopts
Brendan Cully <brendan@kublai.com> [Wed, 20 Jun 2007 20:13:31 -0700] rev 4654
Fix dispatch error message when not in a repo