Martin Geisler <martin@geisler.net> [Fri, 22 Nov 2013 19:11:48 +0100] rev 20144
contrib: stop mentioning obsolete graphlog extension in sample.hgrc
Martin Geisler <martin@geisler.net> [Fri, 22 Nov 2013 17:14:44 +0100] rev 20143
contrib: promote strip extension over MQ in sample.hgrc
Matt Mackall <mpm@selenic.com> [Fri, 22 Nov 2013 17:12:43 +0100] rev 20142
help: use progress instead of mq as in 'hg help config' example
Wagner Bruna <wbruna@yahoo.com> [Sat, 30 Nov 2013 21:50:40 -0200] rev 20141
i18n-pt_BR: fix wording in tag command help text
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 28 Nov 2013 20:10:47 +0900] rev 20140
i18n-ja: synchronized with
5246fd4781d8
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 26 Nov 2013 11:00:49 -0200] rev 20139
i18n-pt_BR: synchronized with
224e96078708
Augie Fackler <raf@durin42.com> [Wed, 27 Nov 2013 16:43:02 -0500] rev 20138
test-import-git.t: work around check-code hating on ^ and $( in tests
Nicolas Vigier <boklm@mars-attacks.org> [Wed, 27 Nov 2013 18:39:00 +0100] rev 20137
patch: add support for git delta hunks
When creating patches modifying binary files using "git format-patch",
git creates 'literal' and 'delta' hunks. Mercurial currently supports
'literal' hunks only, which makes it impossible to import patches with
'delta' hunks.
This changeset adds support for 'delta' hunks. It is a reimplementation
of patch-delta.c from git :
http://git.kernel.org/cgit/git/git.git/tree/patch-delta.c
Sean Farley <sean.michael.farley@gmail.com> [Mon, 25 Nov 2013 12:12:42 -0500] rev 20136
pathcomplete: remove ambiguous entries for sole completion on a directory
Previously, directories were added with the trailing slash and, if there was
only one completion, then another ambiguous entry was created using '.', as
follows:
$ hg rm mer<TAB>
mercurial/./ mercurial//
This was added in
fa6d5c62f3bd (though, some logic existed before that) to work
around bash completion adding a space after the sole entry because we treated
directories and files the same. We no longer do that now so we remove this
unneeded code.
Tests have been updated to match this new behavior.
Sean Farley <sean.michael.farley@gmail.com> [Tue, 26 Nov 2013 14:33:18 -0600] rev 20135
bash_completion: add global support for -b|--branch
Previously, only -r|--rev was parsed globally which meant 'hg push -b <tab>'
would try to complete a path instead of a branch.
Sean Farley <sean.michael.farley@gmail.com> [Tue, 26 Nov 2013 14:31:40 -0600] rev 20134
bash_completion: add global support for -B|--bookmark
Previously, only -r|--rev was parsed globally which meant 'hg push -B <tab>'
would try to complete a path instead of a bookmark.
Sean Farley <sean.michael.farley@gmail.com> [Tue, 26 Nov 2013 14:04:12 -0600] rev 20133
bash_completion: change --rev if-else block into a case
Again, this doesn't change behavior but does make it easy to add cases in the
next patch.
Sean Farley <sean.michael.farley@gmail.com> [Tue, 26 Nov 2013 13:55:33 -0600] rev 20132
bash_completion: simplify if-else logic
There is no change in functionality here but this makes refactoring this later
easier.
Sean Farley <sean.michael.farley@gmail.com> [Mon, 25 Nov 2013 11:38:14 -0500] rev 20131
bash_completion: add _hg_branches for list of branches
Sean Farley <sean.michael.farley@gmail.com> [Tue, 26 Nov 2013 14:38:14 -0600] rev 20130
bash_completion: add -B|--bookmark support for strip
Sean Farley <sean.michael.farley@gmail.com> [Fri, 22 Nov 2013 14:58:41 -0500] rev 20129
bash_completion: add completion for deleting a shelve
Sean Farley <sean.michael.farley@gmail.com> [Thu, 21 Nov 2013 15:14:52 -0500] rev 20128
bash_completion: use correct command for listing shelves
Previously, _hg_shelves used the unshelve command to list current shelves. This
is actually the wrong command. The correct usage is 'hg shelve -l' so we use
that instead.
Sean Farley <sean.michael.farley@gmail.com> [Wed, 20 Nov 2013 19:13:24 -0500] rev 20127
bash_completion: remove restriction on bookmark completion
Previously, we only completed a bookmark when deleting or renaming a
bookmark. Since we can now move a bookmark forward, we drop this restriction.
Sean Farley <sean.michael.farley@gmail.com> [Wed, 20 Nov 2013 14:45:18 -0500] rev 20126
bash_completion: fix issue with subdirectories not being completed
Previously, if there was a directory between the file and first-level directory (e.g. 'bar' in
foo/bar/file), then bash_completion would only list 'foo/file' instead of 'foo/bar/file'.
This behavior was introduced in
80f3ae36f908 to fix spaces in file names. In
this patch, we keep that behavior while also fixing subdirectory completion by
reverting
80f3ae36f908 and instead add backslashes to whitespace manually. This
approach means adding the completion option 'nospace' since we do this manually
now.
Sean Farley <sean.michael.farley@gmail.com> [Wed, 20 Nov 2013 13:19:55 -0500] rev 20125
bash_completion: determine root executable in case of alias
This solves an issue for users that have "alias hg='hg --some_opts'" where they
would see wrong entries in the completion output (such as color codes).
Sean Farley <sean.michael.farley@gmail.com> [Wed, 20 Nov 2013 15:16:54 -0500] rev 20124
bash_completion: expand aliased commands
Sean Farley <sean.michael.farley@gmail.com> [Tue, 19 Nov 2013 11:45:30 -0500] rev 20123
bash_completion: untabify
Sean Farley <sean.michael.farley@gmail.com> [Mon, 25 Nov 2013 12:20:39 -0500] rev 20122
dispatch: turn off custom debugger for HGPLAIN mode
Some debuggers, such as ipdb, load escape codes and color codes even when later
turned off. This will affect scripts that do simple parsing and can't handle
escape codes. Therefore, we only load a custom debugger if ui.plain() is false.
Simon Heimberg <simohe@besonet.ch> [Sun, 17 Nov 2013 12:18:26 +0100] rev 20121
Makefile: temporary copy of hg.pot is hg.pot.tmp instead of hg.pot~
The file ending of temporary files for generating XX.po has been changed to
.tmp (from ~). Use the same ending when generating hg.pot.
Simon Heimberg <simohe@besonet.ch> [Sun, 17 Nov 2013 12:17:55 +0100] rev 20120
Makefile: fix po file updating by using same file name everywhere
The update is done on a temporary file since
ce5d711475a3. The name of this
file was first XX.po~ and has been changed to XX.po.tmp in all except of one
place. Do this now.
Kevin Bullock <kbullock@ringworld.org> [Sun, 24 Nov 2013 17:29:10 -0600] rev 20119
mq: prefer a loop to a double-for list comprehension
The [x for y in l for x in y] syntax is nigh-incomprehensible, and this
is a particularly easy case to expand into a loop since there's no 'if'
condition in the list comprehension.
Martin Geisler <martin@geisler.net> [Sat, 23 Nov 2013 18:34:32 +0100] rev 20118
graphlog: mark as deprecated
Martin Geisler <martin@geisler.net> [Fri, 22 Nov 2013 19:14:17 +0100] rev 20117
tests: don't load unnecessary graphlog extension
Since graphlog is in core, we can use 'hg log -G' instead.
Martin Geisler <martin@geisler.net> [Fri, 22 Nov 2013 19:13:26 +0100] rev 20116
hg: remove outdated comment
The graphlog functionality has been in core since Mercurial 2.3.
Martin Geisler <martin@geisler.net> [Fri, 22 Nov 2013 17:10:08 +0100] rev 20115
tests: use strip extension instead of mq where it makes sense
When a test only uses 'hg strip', it no longer needs to load MQ.
Simon Heimberg <simohe@besonet.ch> [Sat, 23 Nov 2013 01:06:20 +0100] rev 20114
tests: fix `hghave root` on windows
This lets tests\test-hghave.t pass on windows where geteuid does not exist.
Christian Ebert <blacktrash@gmx.net> [Wed, 20 Nov 2013 12:55:08 +0000] rev 20113
keyword: wlock while setting branch in kwdemo
Simon Heimberg <simohe@besonet.ch> [Sun, 17 Nov 2013 15:43:46 +0100] rev 20112
tests: add missing glob
Bryan O'Sullivan <bryano@fb.com> [Tue, 26 Nov 2013 21:55:21 -0800] rev 20111
Merge
Abhay Kadam <abhaykadam88@gmail.com> [Tue, 19 Nov 2013 23:49:11 +0530] rev 20110
mercurial/parsers.c: fix compiler warning
When try to compile on x64 OS X, I get this warning:
mercurial/parsers.c:931:27: warning: implicit conversion loses integer precision
: 'long' to 'int' [-Wshorten-64-to-32]
? 4 : self->raw_length / 2;
The patch verifies if value of self->raw_length falls bellow INT_MAX; if not,
it raises the ValueError exception.
If value of self->raw_length is greater than 4, it's casted to int type, to
eliminate the warning.
Chris Jerdonek <chris.jerdonek@gmail.com> [Tue, 26 Nov 2013 16:14:22 -0800] rev 20109
parse_index2: fix crash on bad argument type (
issue4110)
Passing a non-string to parsers.parse_index2() causes Mercurial to crash
instead of raising a TypeError (found on Mac OS X 10.8.5, Python 2.7.6):
import mercurial.parsers as parsers
parsers.parse_index2(0, 0)
Thread 0 Crashed:: Dispatch queue: com.apple.main-thread
0 parsers.so 0x
000000010e071c59 _index_clearcaches + 73 (parsers.c:644)
1 parsers.so 0x
000000010e06f2d5 index_dealloc + 21 (parsers.c:1767)
2 parsers.so 0x
000000010e074e3b parse_index2 + 347 (parsers.c:1891)
3 org.python.python 0x
000000010dda8b17 PyEval_EvalFrameEx + 9911
This happens because when arguments of the wrong type are passed to
parsers.parse_index2(), indexType's initialization function index_init() in
parsers.c leaves the indexObject instance in a state that indexType's
destructor function index_dealloc() cannot handle.
This patch moves enough of the indexObject initialization code inside
index_init() from after the argument validation code to before it.
This way, when bad arguments are passed to index_init(), the destructor
doesn't crash and the existing code to raise a TypeError works. This
patch also adds a test to check that a TypeError is raised.
Matt Mackall <mpm@selenic.com> [Mon, 25 Nov 2013 16:15:44 -0600] rev 20108
merge with stable
Sean Farley <sean.michael.farley@gmail.com> [Wed, 06 Nov 2013 19:01:14 -0600] rev 20107
bookmarks: consider successor changesets when moving bookmark (
issue4015)
Previously, this required -f because we didn't consider obsolete changesets
(and their children ... or successors of those children, etc.). We now use
obsolete.foreground to calculate acceptable changesets when advancing the
bookmark.
Test coverage has been added.
Simon Heimberg <simohe@besonet.ch> [Wed, 20 Nov 2013 22:03:15 +0100] rev 20106
util: url keeps backslash in paths
Backslashes (\) in paths were encoded to %C5 when converting from url to
string. This does not look nice for windows paths. And it introduces many
problems when running tests on windows.
Mads Kiilerich <madski@unity3d.com> [Sat, 16 Nov 2013 19:55:38 -0500] rev 20105
tests: deal with new gits sending status messages to stderr
git-1.8.4.2 will send messages like
Cloning into 'X'...
done.
to stderr.
Mute stderr.
Matt Mackall <mpm@selenic.com> [Mon, 25 Nov 2013 13:50:36 -0600] rev 20104
subrepo: sanitize non-hg subrepos
Matt Mackall <mpm@selenic.com> [Mon, 25 Nov 2013 13:46:46 -0600] rev 20103
shelve: fix bad argument interaction with largefiles (
issue4111)
Siddharth Agarwal <sid0@fb.com> [Mon, 18 Nov 2013 09:09:05 -0800] rev 20102
strip.stripcmd: remove redundant wlock acquire/release
Now that we acquire and release a wlock in the outer scope, this is redundant.
Matt Mackall <mpm@selenic.com> [Mon, 25 Nov 2013 12:18:29 -0600] rev 20101
merge with stable
Siddharth Agarwal <sid0@fb.com> [Fri, 15 Nov 2013 18:41:40 -0800] rev 20100
bookmarks: make setcurrent with None an error
Siddharth Agarwal <sid0@fb.com> [Fri, 15 Nov 2013 18:31:02 -0800] rev 20099
strip: use bookmarks.unsetcurrent instead of setcurrent with None
Siddharth Agarwal <sid0@fb.com> [Fri, 15 Nov 2013 18:28:57 -0800] rev 20098
bmstore.write: use unsetcurrent instead of setcurrent with None
Siddharth Agarwal <sid0@fb.com> [Fri, 15 Nov 2013 18:06:01 -0800] rev 20097
commands.bookmark: use unsetcurrent instead of setcurrent with None
There are currently two different ways we can have no active bookmark:
.hg/bookmarks.current being missing and it being an empty file. This patch and
upcoming ones make an empty file the only way to represent no active bookmarks.
This is the right choice because it matches the state that a new repository
without bookmarks will be in.
Siddharth Agarwal <sid0@fb.com> [Mon, 18 Nov 2013 08:57:19 -0800] rev 20096
strip: hold wlock for entire duration
Previously, we'd acquire and release the wlock several times. This meant that
other hg processes could come in and change state. Instead of that, retain the
wlock for the entire duration of the strip.
Matt Mackall <mpm@selenic.com> [Fri, 22 Nov 2013 17:26:58 -0600] rev 20095
merge with stable
Mads Kiilerich <madski@unity3d.com> [Sun, 10 Nov 2013 18:51:21 +0100] rev 20094
bisect: report "both good and bad" as such, not as "not directly related"
Martin Geisler <martin@geisler.net> [Fri, 08 Nov 2013 11:49:13 +0100] rev 20093
phase: better error message when --force is needed
When trying to turn a draft changeset into a secret changeset, I was
told:
% hg phase -s .
cannot move 1 changesets to a more permissive phase, use --force
no phases changed
That message struck me as being backwards -- the secret phase feels
less permissive to me since it restricts the changesets from being
pushed.
We don't use the word "permissive" elsewhere, 'hg help phase' talks
about "lower phases" and "higher phases". I therefore reformulated the
error message to be
cannot move 1 changesets to a higher phase, use --force
That is not perfect either, but more in line with the help text. An
alternative could be
cannot move phase backwards for 1 changesets, use --force
which fits better with the help text for --force.
Isaac Jurado <diptongo@gmail.com> [Fri, 08 Nov 2013 09:48:01 +0100] rev 20092
hgweb: ignore non numeric "revcount" parameter values (
issue4091)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Tue, 12 Nov 2013 16:23:52 +0900] rev 20091
lock: take both vfs and lock file path relative to vfs to access via vfs
This patch makes "lock.lock.__init__()" take both vfs and lock file
path relative to vfs, instead of absolute path to lock file.
This allows lock file to be accessed via vfs.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Tue, 12 Nov 2013 16:23:52 +0900] rev 20090
vfs: add "makelock()" and "readlock()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Tue, 12 Nov 2013 16:23:52 +0900] rev 20089
hg: rewrite "copystore()" with vfs
This patch rewrites "copystore()" with vfs, because succeeding patch
requires "lock.lock()" invocation with vfs.
This patch uses 'dstbase + "/lock"' instead of "join()" with both
elements even on Windows environment but it should be reasonable,
because target files given from "store.copyfiles()" already uses "/"
as path separator.
"util.copyfiles()" between two vfs-s may have to be rewritten in the
future.