Kevin Bullock <kbullock@ringworld.org> [Wed, 16 Nov 2011 15:29:57 -0600] rev 15621
bookmarks: update and updatecurrentbookmark return status
This makes bookmarks.update() and bookmarks.updatecurrentbookmark() return
True or False to indicate whether the bookmark was updated or not. This allows
callers to e.g. abort if the update failed.
Kevin Bullock <kbullock@ringworld.org> [Wed, 07 Dec 2011 11:23:13 -0600] rev 15620
bookmarks: clarify help for use of merge and update
Kevin Bullock <kbullock@ringworld.org> [Wed, 07 Dec 2011 11:23:01 -0600] rev 15619
merge: make 'nothing to merge' aborts consistent
Makes the 'nothing to merge' abort messages in commands.py consistent with
those in merge.py. Also makes commands.merge() and merge.update() use hints.
The tests show the changes.
Kevin Bullock <kbullock@ringworld.org> [Wed, 07 Dec 2011 11:22:57 -0600] rev 15618
merge: remove excess creation of changectx
Na'Tosha Bard <natosha@unity3d.com> [Wed, 07 Dec 2011 12:56:44 +0100] rev 15617
largefiles: optimize performance of status on largefiles repos (issue3136)
Olav Reinert <seroton10@gmail.com> [Tue, 06 Dec 2011 15:50:28 +0100] rev 15616
Describe all files related to the standard commands.
Matt Mackall <mpm@selenic.com> [Thu, 08 Dec 2011 14:32:44 -0600] rev 15615
branch: warn on branching
Matt Mackall <mpm@selenic.com> [Wed, 07 Dec 2011 16:19:39 -0600] rev 15614
bookmarks: mark divergent bookmarks with book@pathalias when source in [paths]
Matt Mackall <mpm@selenic.com> [Tue, 06 Dec 2011 14:17:33 -0600] rev 15613
bookmarks: shadow divergent bookmarks of foo with foo@n
Christian Ebert <blacktrash@gmx.net> [Tue, 06 Dec 2011 13:21:45 +0100] rev 15612
help: properly underline annotate config heading
Matt Mackall <mpm@selenic.com> [Mon, 05 Dec 2011 17:48:40 -0600] rev 15611
merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 05 Dec 2011 17:09:11 -0600] rev 15610
branch: move note about permanence to the top, add 'global'
Patrick Mezard <pmezard@gmail.com> [Sun, 04 Dec 2011 18:22:25 +0100] rev 15609
util: fix url.__str__() for windows file URLs
Before:
>>> str(url('file:///c:/tmp/foo/bar'))
'file:c%3C/tmp/foo/bar'
After:
>>> str(url('file:///c:/tmp/foo/bar'))
'file:///c%3C/tmp/foo/bar'
The previous behaviour had no effect on mercurial itself (clone command for
instance) because we fortunately called .localpath() on the parsed URL.
hgsubversion was not so lucky and cloning a local subversion repository on
Windows no longer worked on the default branch (it works on stable because
de7e2fba4326 defeats the hasdriveletter() test in url class).
I do not know if the %3C is correct or not but svn accepts file:// URLs
containing it. Mads fixed it in de7e2fba4326, so we can always backport should
the need arise.
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 02 Dec 2011 21:38:57 -0200] rev 15608
convert: tolerate trailing spaces on map files
A convert run with a branchmap made with
echo default namedbranch > branchmap
on Windows fails silently and surprisingly; it actually
adds a space after 'namedbranch', so it ends up mapping
"default namedbranch" to "".
This also affects splicemaps, since the same parser is used
for both.
Patrick Mezard <pmezard@gmail.com> [Fri, 02 Dec 2011 16:50:48 +0100] rev 15607
test-svn-subrepo: fix reference output for svn 1.7
I modified check-code.py "$?" detection because I thought my use was legit, we
cannot test exit status of pipelines commands except for the last one without
this. So it now tolerates "[$?" which is unlikely to be added by mistake.
Tested on:
- OSX + svn 1.7.1
- Linux + svn 1.6.12
Patrick Mezard <pmezard@gmail.com> [Fri, 02 Dec 2011 18:36:32 +0100] rev 15606
convert: simplify getargmax() with propertycache
Patrick Mezard <pmezard@gmail.com> [Fri, 02 Dec 2011 17:38:07 +0100] rev 15605
convert/svn: update svn working copy only when necessary
I have not tried to produce the bug but here is idea: f85c0034a062 stopped
passing the modified files list to commit. This makes commit more fragile since
we better not touch unrelated files by mistake. But putcommit() still applies
file changes before exiting upon ignored revisions. So in theory, we could
apply changes from a skipped branch then commit them as part of another
revision.
This patch makes the sink apply the changes after possibly skipping the
revision. The real fix would be to use svn commit --targets option to pass the
file names in an argument file. Unfortunately, it seems to be bugged in svn
1.7.1:
http://svn.haxx.se/dev/archive-2011-11/0211.shtml
Greg Ward <greg-hg@gerg.ca> [Thu, 01 Dec 2011 17:39:30 -0500] rev 15604
rollback: always call destroyed() (regression from 1.9)
The contract for repo.destroyed() is that it is called whenever
changesets are destroyed, either by strip or by rollback. That
contract was inadvertently broken in 7c26ce9edbd2, when we made a
chunk of code conditional on destroying one of the working dir's
parents. Oops: it doesn't matter *which* changesets are destroyed or
what their relationship is to the working dir, we should call
repo.destroyed() whenever we destroy changesets.
Matt Mackall <mpm@selenic.com> [Thu, 01 Dec 2011 15:57:10 -0600] rev 15603
merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 01 Dec 2011 15:55:37 -0600] rev 15602
Added signature for changeset 195dbd1cef0c
Matt Mackall <mpm@selenic.com> [Thu, 01 Dec 2011 15:55:34 -0600] rev 15601
Added tag 2.0.1 for changeset 195dbd1cef0c
Matt Mackall <mpm@selenic.com> [Thu, 01 Dec 2011 15:51:36 -0600] rev 15600
alias: shortcut command matching show shadowing works properly (issue3104)
An alias for 'log' was stored in the same command table as
'^log|history'. If the hash function happens to give the latter first,
the alias is effectively ignored when matching 'log'.
Patrick Mezard <pmezard@gmail.com> [Thu, 01 Dec 2011 20:42:24 +0100] rev 15599
convert/svn: fix URL quoting issue with svn 1.7
As of svn 1.7, many svn calls expect "canonical" paths. In theory, we should
call svn.core.*canonicalize() on all paths before passing them to the API.
Instead, we assume the base url is canonical and copy the behaviour of svn URL
encoding function so we can extend it safely with new components.
Na'Tosha Bard <natosha@unity3d.com> [Wed, 30 Nov 2011 15:11:00 +0100] rev 15598
largefiles: fix rename (issue3093)
Sune Foldager <cryo@cyanite.org> [Thu, 01 Dec 2011 14:17:17 +0100] rev 15597
bundlerepo: don't write branch cache to disk
Calling branchmap() or similar on a bundlerepo would write the bundle-augmented
branch cache to disk, requiring a subsequent expensive rebuild when the repo
is used without the bundle.
Matt Mackall <mpm@selenic.com> [Thu, 01 Dec 2011 01:42:03 -0600] rev 15596
merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 30 Nov 2011 22:43:24 -0600] rev 15595
revset: balance %l or-expressions (issue3129)
Matt Mackall <mpm@selenic.com> [Wed, 30 Nov 2011 17:17:06 -0600] rev 15594
merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 30 Nov 2011 17:16:43 -0600] rev 15593
merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 29 Nov 2011 12:40:26 -0200] rev 15592
i18n-pt_BR: synchronized with 10a4fab20ed9
Matt Mackall <mpm@selenic.com> [Wed, 30 Nov 2011 17:15:39 -0600] rev 15591
merge with stable
Arne Babenhauserheide <bab@draketo.de> [Fri, 04 Nov 2011 10:18:40 +0100] rev 15590
clone: get all bookmarks before updating
Matt Mackall <mpm@selenic.com> [Wed, 30 Nov 2011 16:53:44 -0600] rev 15589
lock: change name of release chain
Matt Mackall <mpm@selenic.com> [Wed, 30 Nov 2011 16:20:07 -0600] rev 15588
localrepo: remove asserts in _afterlock
Matt Mackall <mpm@selenic.com> [Wed, 30 Nov 2011 15:36:55 -0600] rev 15587
localrepo: rename _postrelease to _afterlock
Matt Mackall <mpm@selenic.com> [Wed, 30 Nov 2011 15:33:44 -0600] rev 15586
addchangegroup: ony queue hooks when we have changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 28 Nov 2011 01:32:13 +0100] rev 15585
addchangegroup: remove the lock argument on the addchangegroup methods
This argument is no longer require. post lock release code is now handled with
dedicated post release callback code in lock itself.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 28 Nov 2011 01:18:15 +0100] rev 15584
addchangegroup: use a postrelease callback to call changegroup hook
This is will allow addchangegroup to drop lock related code.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 28 Nov 2011 15:05:26 +0100] rev 15583
lock: add mechanism to register post release callback
Benoit Allard <benoit@aeteurope.nl> [Tue, 29 Nov 2011 19:51:35 +0100] rev 15582
diff: '\ No newline at end of file' is also not part of the header
Diff containing '\ No newline at end of file' were colorized incorrectly.
Mads Kiilerich <mads@kiilerich.com> [Sat, 26 Nov 2011 00:10:31 +0100] rev 15581
ssh: quote remote paths (issue2983)
Mads Kiilerich <mads@kiilerich.com> [Sat, 26 Nov 2011 00:10:12 +0100] rev 15580
id: add command line options for handling ssh and https urls
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 24 Nov 2011 17:54:50 +0900] rev 15579
largefiles: use "ui.configlist()" to get largefiles.patterns configuration
current lfconvert implementation uses combination of "ui.config()" and
"str.split(' ')" to get largefiles.patterns configuration.
but it can not handle multiline configuration in hgrc files correctly.
lfconvert should use "ui.configlist()" instead of it, as same as
override_add does.
Patrick Mezard <pmezard@gmail.com> [Thu, 24 Nov 2011 11:38:16 +0100] rev 15578
status: support revsets with --change
Mads Kiilerich <mads@kiilerich.com> [Fri, 25 Nov 2011 02:11:12 +0100] rev 15577
merge with stable
Mads Kiilerich <mads@kiilerich.com> [Fri, 25 Nov 2011 02:09:48 +0100] rev 15576
largefiles: avoid use of uinitialized variable in case of errors
Mads Kiilerich <mads@kiilerich.com> [Fri, 25 Nov 2011 02:09:45 +0100] rev 15575
tests: remove unstable debugstate output in test-largefiles.t
Martin Geisler <mg@aragost.com> [Thu, 24 Nov 2011 18:22:45 +0100] rev 15574
largefiles: simplify lfutil.writehash
This was unnecessarily verbose: there is no need to unlink the file
when we open it for write anyway, and there is no need to check if the
file exists after we created it.
Martin Geisler <mg@aragost.com> [Thu, 24 Nov 2011 18:22:44 +0100] rev 15573
merge with stable
Martin Geisler <mg@aragost.com> [Thu, 24 Nov 2011 18:13:18 +0100] rev 15572
largefiles: copy files into .hg/largefiles atomically
Copying from the user cache into .hg/largefiles could fail halfway
though with a partially written file.
Martin Geisler <mg@aragost.com> [Thu, 24 Nov 2011 18:12:13 +0100] rev 15571
largefiles: write .hg/largefiles/ files atomically
Before, it was possible to create a
.hg/largefiles/hash
file with truncated content, i.e., content where
SHA-1(content) != hash
This breaks the fundamental invariant in largefiles that the file
content for files in .hg/largefiles hash to the filename.
Martin Geisler <mg@aragost.com> [Thu, 24 Nov 2011 18:11:43 +0100] rev 15570
largefiles: add comment about non-atomic working directory
When updating the working copy with a normal 'hg update', we also
don't use atomic writes.
Mads Kiilerich <mads@kiilerich.com> [Mon, 21 Nov 2011 01:49:20 +0100] rev 15569
tests: use an alias to make msys 'pwd' return paths with forward slashes
Mads Kiilerich <mads@kiilerich.com> [Mon, 21 Nov 2011 01:49:20 +0100] rev 15568
tests: skip cvs tests with msys on windows
They will fail with weird 'ssh' errors.
Mads Kiilerich <mads@kiilerich.com> [Mon, 21 Nov 2011 01:49:20 +0100] rev 15567
tests: introduce 'hghave msys' to skip tests that would fail because of msys
Matt Mackall <mpm@selenic.com> [Wed, 23 Nov 2011 16:35:17 -0600] rev 15566
merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 23 Nov 2011 16:25:44 -0600] rev 15565
convert: handle trailing slashes in filemap better (issue3124)
Matt Mackall <mpm@selenic.com> [Wed, 23 Nov 2011 14:24:56 -0800] rev 15564
tests: remove test-casecollision-i18n.t
The result of this test is quite suspect. Remove it for now as it now
correctly breaks on HFS+.
Matt Mackall <mpm@selenic.com> [Wed, 23 Nov 2011 14:22:37 -0800] rev 15563
posix: fix HFS+ percent-encoding folding
We use 'ignore' rather than 'replace' so we don't have to deal with
u+FFFD in UTF-8 round-trip.
Mads Kiilerich <mads@kiilerich.com> [Wed, 23 Nov 2011 02:44:11 +0100] rev 15562
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)
Quoted-printable was already used for the more critical patch mails, so it
should be fine for everything else as well.
Mads Kiilerich <mads@kiilerich.com> [Wed, 23 Nov 2011 02:36:33 +0100] rev 15561
notify: add option for writing to mbox
This makes it possible to test how the mails that are sent _really_ look like.
Mads Kiilerich <mads@kiilerich.com> [Wed, 23 Nov 2011 02:11:24 +0100] rev 15560
mail: mbox handling as a part of mail handling, refactored from patchbomb
Mads Kiilerich <mads@kiilerich.com> [Wed, 23 Nov 2011 02:09:38 +0100] rev 15559
patchbomb: minor refactoring of mbox functionality, preparing for move
This allows reuse of the mbox functionality but causes minor changes in the
patchbomb console output when writing to a mbox.
Mads Kiilerich <mads@kiilerich.com> [Wed, 23 Nov 2011 03:14:24 +0100] rev 15558
tests: run check-code with warnings and maintain a whitelist
check-code has fine warning checks, but they are a bit noisy and nobody used
them.
Now the warnings will be run in the test suite, where a list of accepted
warnings will be maintained.
Those who introduce or touch a line with a warning will now have to update the
whitelist ... or fix the warning.