Colin Caughie <c.caughie@indigovision.com> [Sat, 13 Nov 2010 15:02:02 +0100] rev 12974
eol: exclude .hgtags file from eol translation (issue2493)
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 13 Nov 2010 11:58:51 +0900] rev 12973
merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 11 Nov 2010 02:10:37 +0900] rev 12972
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Regression from 99cafcae25d9. That previous commit is not supposed
to affect log calls without --follow, so we step out of this
codepath if follow is not True, and it's enough to fix the
regression.
When --follow is given, we fix the issue by taking into account
changesets that have a rev > maxrev to build the filegraph: even if
those files are not included in the final result, it's still needed
to walk correctly the graph from the end of the filelog to minrev, to
track accurately renames.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 11 Nov 2010 02:05:02 +0900] rev 12971
cmdutil: move range check outside of filerevgen
Simple refactor, no logic change.
Matt Mackall <mpm@selenic.com> [Fri, 12 Nov 2010 01:22:46 -0600] rev 12970
merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 12 Nov 2010 01:21:45 -0600] rev 12969
pushkey: force HTTP POST on push and add tests (issue2489)
Martin Geisler <mg@lazybytes.net> [Thu, 11 Nov 2010 07:23:38 +0100] rev 12968
merge with stable
Adrian Buehlmann <adrian@cadifra.com> [Wed, 10 Nov 2010 17:28:24 +0100] rev 12967
tests: add test-hardlinks.t
partially testing util.opener.__call__
Yuya Nishihara <yuya@tcha.org> [Thu, 11 Nov 2010 01:12:51 +0900] rev 12966
win32: remove try-catch block of GetModuleFileNameEx (issue2480)
According to the API document, GetModuleFileName is the preferred way to
retrieve the filename of the current process. So we shouldn't try
GetModuleFileName'Ex' first.
Previously system_rcpath_win32() happened to return unicode paths due to
GetModuleFileNameEx (issue2480). This problem is fixed as GetModuleFileName
never return unicode.
Richard Hopkins [Tue, 09 Nov 2010 20:25:56 +0000] rev 12965
gpg, commands: fixed util.abort to util.Abort typos
gpg: Fixed util.abort typo after entering wrong password.
commands: Fixed util.abort typo in debugindex.
Martin Geisler <mg@lazybytes.net> [Thu, 11 Nov 2010 00:08:09 +0100] rev 12964
check-code: using and/or/not as a function is bad style
Martin Geisler <mg@aragost.com> [Wed, 10 Nov 2010 15:44:19 +0100] rev 12963
merge with stable
Klaus Koch <kuk42@gmx.net> [Sun, 07 Nov 2010 20:18:57 +0100] rev 12962
bundlerepository: get rid of temporary bundle files (issue2478)
This bug was introduced in 40935b59518b and 6277a9469dff.
Martin Geisler <mg@aragost.com> [Wed, 10 Nov 2010 15:38:00 +0100] rev 12961
bundlerepository: test self.tempfile field, not tempfile module
This error was introduced in 680fe77ab5b8.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Wed, 10 Nov 2010 13:48:23 +0100] rev 12960
test-mq-qnew: handle Mac OS X error strings.
On Mac OS X, opening a file called '42/' results in ENOENT and not
EISDIR if the directory doesn't exist.
timeless <timeless@gmail.com> [Wed, 10 Nov 2010 04:53:11 -0600] rev 12959
help: urls help should include see also for paths
Martin Geisler <mg@aragost.com> [Wed, 10 Nov 2010 14:46:13 +0100] rev 12958
minirst: link to HelpStyleGuide in docstring
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 09 Nov 2010 13:43:35 +0900] rev 12957
util: clarify purpose of MBTextWrapper class
It's easy to get confused and scared of an Unicode monster when
skimming through this code: document that this is really just
about column-counting.
Matt Mackall <mpm@selenic.com> [Mon, 08 Nov 2010 17:29:23 -0600] rev 12956
merge with stable
Erik Zielke <ez@aragost.com> [Mon, 08 Nov 2010 10:56:47 +0100] rev 12955
run-test: fixed wrong parenthesis
Fixed wrong placement of end parenthesis, from b911cb80c671
Matt Mackall <mpm@selenic.com> [Mon, 08 Nov 2010 17:16:29 -0600] rev 12954
merge with crew
Matt Mackall <mpm@selenic.com> [Mon, 08 Nov 2010 17:16:17 -0600] rev 12953
merge with crew
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 09 Nov 2010 01:33:48 +0900] rev 12952
merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 08 Nov 2010 22:45:56 +0900] rev 12951
graphmod: safer code when a changeset has two identical parents
While this situation should never under normal use, some real
life repos sometimes contain such changesets (older hg versions,
broken rebases, etc...)
hgweb was displaying an "Internal error" in this case, and graphlog
displayed a redundant branch all the way to null: it does not cost us
much to just ignore this extra parent when constructing the DAG.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 07 Nov 2010 18:23:48 +0900] rev 12950
revlog: fix descendants() if nullrev is in revs
We were not returning the correct result if nullrev was in revs, as we
are checking parent(currentrev) != nullrev before yielding currentrev
test-convert-hg-startrev was wrong: if we start converting from rev -1 and
onwards, all the descendants of -1 (full repo) should be converted.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 07 Nov 2010 18:16:07 +0900] rev 12949
revlog: if start is nullrev, end is always a descendant
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 07 Nov 2010 22:03:28 +0900] rev 12948
mq: use sets instead of lists for speed
The code eventually converts data through sets to ensure unicity:
do it earlier to allow faster __contains__ lookups and avoid
`del l[l.index(x)]` kind of code.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 07 Nov 2010 18:59:27 +0900] rev 12947
context: add __repr__ methods to workingfilectx and workingctx