Matt Mackall <mpm@selenic.com> [Mon, 09 Jun 2014 14:11:17 -0500] rev 21721
resolve: fix grammar of no matching files message
Matt Mackall <mpm@selenic.com> [Mon, 09 Jun 2014 13:53:23 -0500] rev 21720
merge with stable
Sean Farley <sean.michael.farley@gmail.com> [Fri, 06 Jun 2014 00:21:46 -0500] rev 21719
bash_completion: add -l|--list support for shelve
This was overlooked previously and found via 'hg shelve -p -l <tab>' (to show
the diff of the shelved commit).
Yuya Nishihara <yuya@tcha.org> [Sat, 31 May 2014 21:21:06 +0900] rev 21718
workingctx: duplicate status list received at _poststatus hook
basectx.status may reorder the list after workingctx._poststatus is called,
so workingctx must copy it. Otherwise, wctx.deleted() would return "unknown"
files, for example.
Chinmay Joshi <c@chinmayjoshi.com> [Thu, 05 Jun 2014 15:24:29 +0530] rev 21717
patch: replace functions in fsbackend to use vfs
Several functions in fsbackend are replaced to use vfs functions.
vfs operations are applied on filename and path is joined by _join().
Chinmay Joshi <c@chinmayjoshi.com> [Thu, 05 Jun 2014 15:16:44 +0530] rev 21716
vfs: add unlinkpath to vfs
This patch adds unlinkpath() function in vfs to replace util.unlinkpath().
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 05 Jun 2014 22:20:32 +0900] rev 21715
shelve: add option combination tests for refactoring in succeeding patch
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 01 Jun 2014 00:08:33 +0900] rev 21714
qfold: allow to specify '--message/'--logfile' and '--edit' at the same time
Before this patch, 'hg qfold' disallows to specify
'--message/'--logfile' and '--edit' at the same time.
'hg qfold' has disallowed such combination since Mercurial 0.9.2, but
this restriction seems not to be reasonable for recent Mercurial,
because all other commands creating new changeset allow it.
This patch allows 'hg qfold' to specify '--message/'--logfile' and
'--edit' at the same time like other commands creating new changeset.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 01 Jun 2014 00:08:32 +0900] rev 21713
qrefresh: allow to specify '--message/'--logfile' and '--edit' at the same time
Before this patch, 'hg qrefresh' disallows to specify
'--message/'--logfile' and '--edit' at the same time.
'hg qrefresh' has disallowed such combination since Mercurial 0.9.2,
but this restriction seems not to be reasonable for recent Mercurial,
because all other commands creating new changeset allow it.
This patch allows 'hg qrefresh' to specify '--message/'--logfile' and
'--edit' at the same time like other commands creating new changeset.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 01 Jun 2014 00:08:32 +0900] rev 21712
backout: accept '--edit' like other commands creating new changeset
After this patch, users can invoke editor for the commit message by
'--edit' option regardless of '--message'/'--logfile'.