Sun, 06 May 2012 14:15:17 -0500 graft: remark on empty graft
Matt Mackall <mpm@selenic.com> [Sun, 06 May 2012 14:15:17 -0500] rev 16600
graft: remark on empty graft
Fri, 04 May 2012 17:27:14 -0500 filectx: make ancestor require actx
Matt Mackall <mpm@selenic.com> [Fri, 04 May 2012 17:27:14 -0500] rev 16599
filectx: make ancestor require actx When grafting or rebasing, we need to know the target ancestor.
Mon, 07 May 2012 21:49:45 +0200 pure/base85: align exception type/msg on base85.c stable
Patrick Mezard <patrick@mezard.eu> [Mon, 07 May 2012 21:49:45 +0200] rev 16598
pure/base85: align exception type/msg on base85.c brendan mentioned on IRC that b64decode raises a TypeError too, but while the previous exception type may be better in general, it is much easier to make it behave like the related C code and changes nothing for mercurial itself.
Mon, 07 May 2012 15:40:50 -0500 parsers: fix refcount bug on corrupt index stable
Matt Mackall <mpm@selenic.com> [Mon, 07 May 2012 15:40:50 -0500] rev 16597
parsers: fix refcount bug on corrupt index When we encounter a corrupt index, we "fail" the init but our destructor still gets called. On some systems, this was causing us to attempt to decref a dangling to self->data.
Fri, 04 May 2012 14:19:55 +0200 subrepo: do not traceback on .hgsubstate parsing errors stable
Patrick Mezard <patrick@mezard.eu> [Fri, 04 May 2012 14:19:55 +0200] rev 16596
subrepo: do not traceback on .hgsubstate parsing errors Note that aborting in subrepo.state() prevents "repairing" commands like revert to be issued. The user will have to edit the .hgsubstate manually (but he probably had already otherwise this would not be failing). The same behaviour already happens with invalid .hgsub entries.
Fri, 04 May 2012 14:19:52 +0200 subrepo: ignore blank lines in .hgsubstate (issue3424) stable
Patrick Mezard <patrick@mezard.eu> [Fri, 04 May 2012 14:19:52 +0200] rev 16595
subrepo: ignore blank lines in .hgsubstate (issue3424) Reported by Sebastian Krysmanski <infomail@lordb.de>
Fri, 04 May 2012 14:36:40 -0400 largefiles: in putlfile, ensure tempfile's directory exists prior to creation stable
hlian [Fri, 04 May 2012 14:36:40 -0400] rev 16594
largefiles: in putlfile, ensure tempfile's directory exists prior to creation Let R be a repo served by an hg daemon on a machine with an empty largefiles cache. Pushing a largefiles repo to R will result in a no-such-file-or-directory OSError because putlfile will attempt to create a temporary file in R/.hg/largefiles, which does not yet exist. This patch also adds a regression test for this scenario.
Wed, 02 May 2012 17:15:11 -0700 bisect: save current state before running a command stable
Bryan O'Sullivan <bryano@fb.com> [Wed, 02 May 2012 17:15:11 -0700] rev 16593
bisect: save current state before running a command This prevents an external command being run during a bisect from querying stale data.
Mon, 07 May 2012 13:40:58 +0200 merge with stable
Martin Geisler <mg@aragost.com> [Mon, 07 May 2012 13:40:58 +0200] rev 16592
merge with stable
Sun, 06 May 2012 23:58:04 +0900 commands: parse ui.strict config item as bool stable
Yuya Nishihara <yuya@tcha.org> [Sun, 06 May 2012 23:58:04 +0900] rev 16591
commands: parse ui.strict config item as bool
Mon, 07 May 2012 10:02:50 +0200 check-code: catch unnecessary s.strip().split() calls
Martin Geisler <mg@aragost.com> [Mon, 07 May 2012 10:02:50 +0200] rev 16590
check-code: catch unnecessary s.strip().split() calls
Fri, 04 May 2012 15:29:07 +0200 tags: line.rstrip().split() can be replaced with line.split()
Martin Geisler <mg@aragost.com> [Fri, 04 May 2012 15:29:07 +0200] rev 16589
tags: line.rstrip().split() can be replaced with line.split() The line looks like "123 <node> <node>" and does not start with whitespace: it was therefore not significant that rstrip was used instead of strip. Furthermore, the first part is fed to int, which will itself strip away whitespace before converting the string to an integer.
Fri, 04 May 2012 15:24:00 +0200 phases: line.strip().split() == line.split()
Martin Geisler <mg@aragost.com> [Fri, 04 May 2012 15:24:00 +0200] rev 16588
phases: line.strip().split() == line.split()
Sun, 06 May 2012 14:36:42 +0200 merge with stable
Martin Geisler <mg@lazybytes.net> [Sun, 06 May 2012 14:36:42 +0200] rev 16587
merge with stable
Sun, 06 May 2012 13:14:58 +0200 largefiles: fix "hg status dir" missing regular files (issue3421) stable
Patrick Mezard <patrick@mezard.eu> [Sun, 06 May 2012 13:14:58 +0200] rev 16586
largefiles: fix "hg status dir" missing regular files (issue3421) largefiles status implementation attemps to rewrite the input match objects to match the "standins" as well as the regular files. When fixing the directories listed in match.files(), if there was related standin entry, it was kept and the original path discarded. But directories can appear both as regular and standin entries.
Sun, 06 May 2012 10:36:32 +0200 help/config: remove outdated false claim about pywin32 stable
Adrian Buehlmann <adrian@cadifra.com> [Sun, 06 May 2012 10:36:32 +0200] rev 16585
help/config: remove outdated false claim about pywin32 Since version 1.8 (released on 2011-03-01), Mercurial doesn't use pywin32 any more. The old fallback mechanism to use C:\Mercurial\Mercurial.ini if pywin32 is not installed was removed in 244772f67ac1.
Fri, 04 May 2012 19:19:28 +0200 merge with stable
Martin Geisler <mg@lazybytes.net> [Fri, 04 May 2012 19:19:28 +0200] rev 16584
merge with stable
Fri, 04 May 2012 09:20:28 -0500 revert: don't re-create changeset context
Kevin Bullock <kbullock@ringworld.org> [Fri, 04 May 2012 09:20:28 -0500] rev 16583
revert: don't re-create changeset context
Fri, 04 May 2012 09:14:55 -0700 factotum: add man reference to help output stable
Steven Stallion <sstallion@gmail.com> [Fri, 04 May 2012 09:14:55 -0700] rev 16582
factotum: add man reference to help output
Fri, 04 May 2012 14:40:11 +0200 test-largefiles: better formatting of comments
Martin Geisler <mg@aragost.com> [Fri, 04 May 2012 14:40:11 +0200] rev 16581
test-largefiles: better formatting of comments
Fri, 04 May 2012 14:39:37 +0200 test-largefiles: sort output to ensure test stability
Martin Geisler <mg@aragost.com> [Fri, 04 May 2012 14:39:37 +0200] rev 16580
test-largefiles: sort output to ensure test stability
Fri, 04 May 2012 12:21:56 +0200 merge with stable
Martin Geisler <mg@aragost.com> [Fri, 04 May 2012 12:21:56 +0200] rev 16579
merge with stable
Thu, 03 May 2012 21:32:57 -0400 largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com> [Thu, 03 May 2012 21:32:57 -0400] rev 16578
largefiles: make archive -S store largefiles instead of standins This is essentially a copy of largefile's override of archive() in the archival class, adapted for overriding hgsubrepo's archive(). That means decoding isn't taken into consideration, nor is .hg_archival.txt generated (the same goes for regular subrepos). Unlike subrepos, but consistent with largefile's handling of the top repo, ui.progress() is *not* called. This should probably be refactored at some point, but at least this generates the archives properly for now. Previously, the standins were ignored and the largefiles were archived only for the top level repo. Long term, it would probably be most desirable to figure out how to tweak archival's archive() if necessary such that largefiles doesn't need to override it completely just to special case the translating of standins to the real files. Largefiles will already return a context with the true largefiles instead of the standins if lfilesrepo's lfstatus is True- perhaps this can be leveraged?
Fri, 04 May 2012 12:04:07 +0200 paper, monoblue: link correctly to lines in annotate view stable
Martin Geisler <mg@aragost.com> [Fri, 04 May 2012 12:04:07 +0200] rev 16577
paper, monoblue: link correctly to lines in annotate view The links were to "foo#123" instead of "foo#l123". The gitweb and spartan templates were already producing the correct links.
Thu, 03 May 2012 16:12:52 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2012 16:12:52 -0500] rev 16576
merge with stable
Thu, 03 May 2012 16:06:33 -0500 Added signature for changeset 5983de86462c stable
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2012 16:06:33 -0500] rev 16575
Added signature for changeset 5983de86462c
Thu, 03 May 2012 16:06:30 -0500 Added tag 2.2.1 for changeset 5983de86462c stable
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2012 16:06:30 -0500] rev 16574
Added tag 2.2.1 for changeset 5983de86462c
Thu, 03 May 2012 16:03:08 -0500 bookmarks: catch the proper exception for missing revisions stable 2.2.1
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2012 16:03:08 -0500] rev 16573
bookmarks: catch the proper exception for missing revisions This fixes a regression from 1.7
(0) -10000 -3000 -1000 -300 -100 -50 -28 +28 +50 +100 +300 +1000 +3000 +10000 +30000 tip