Matt Mackall <mpm@selenic.com> [Sat, 31 Jul 2010 18:27:03 -0500] rev 11718
help: fix bytes/digit confusion for hashes
spotted by FUJIWARA Katsunori <fujiwara@ascade.co.jp>
Matt Mackall <mpm@selenic.com> [Sat, 31 Jul 2010 18:12:50 -0500] rev 11717
Merge with stable
timeless <timeless@gmail.com> [Fri, 30 Jul 2010 10:32:24 +0300] rev 11716
progress: use gerund (updating) for merge progress
Gilles Moris <gilles.moris@free.fr> [Sat, 10 Jul 2010 21:23:00 +0200] rev 11715
qpush --move: move the right patch even with comment lines
88fc876a4833 caused that we find the index of the moving patch in self.series
but look it up in self.full_series. The difference between these is that
full_series also contains comment lines, and we thus moved the wrong patch.
Use back self.full_series to find the moving patch, but take care of striping
the patch guard markers before comparing the patch name. Test cases have been
added for comments and empty lines in self.full_series, and for the case of
guarded patches.
Original patch contributed by Mads Kiilerich <mads@kiilerich.com>
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 31 Jul 2010 11:41:58 +0900] rev 11714
merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 31 Jul 2010 11:41:42 +0900] rev 11713
perf: break down long line
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 31 Jul 2010 11:36:24 +0900] rev 11712
dispatch: trailing whitespace
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 31 Jul 2010 11:05:11 +0900] rev 11711
merge crew and main
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 31 Jul 2010 11:04:33 +0900] rev 11710
merge crew and main
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 31 Jul 2010 10:50:29 +0900] rev 11709
mq: clarify the fact that qimport is trying to read a file
"hg qimport tip" would throw "abort: unable to read tip" before this.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 30 Jul 2010 10:07:46 +0900] rev 11708
revset: add min function
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 30 Jul 2010 14:41:47 +0900] rev 11707
runrst: try to be more helpful if docutils is not installed
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 29 Jul 2010 17:18:17 +0900] rev 11706
mq: correct qimport documentation
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 29 Jul 2010 12:10:22 +0900] rev 11705
merge with stable
Idan Kamara <idankk86@gmail.com> [Sat, 24 Jul 2010 11:20:21 +0300] rev 11704
bookmarks: don't allow name to contain whitespaces only
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 29 Jul 2010 10:39:59 +0900] rev 11703
context: reuse filecontext.cmp in workingfilecontext.cmp
Same code path should mean less mistakes, and hopefully, better
caching.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 27 Jul 2010 23:40:46 +0900] rev 11702
filectx: use cmp(self, fctx) instead of cmp(self, text)
This allows more flexibility in implementation, and in particular,
lets the context decide if revision text has to be loaded or not.
Patrick Mezard <pmezard@gmail.com> [Wed, 28 Jul 2010 11:07:20 +0200] rev 11701
mq: fix qimport --name --existing --force on win32
os.rename() does not overwrite existing targets on Windows.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 23 Jul 2010 23:43:43 +0900] rev 11700
mq: document possible combination of -e and -n for qimport
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 21 Jul 2010 11:53:09 +0900] rev 11699
mq: support "qimport --existing --name renametothis thatexistingpatch"
Before this change, the command would abort with a not too clear "patch
renametothis does not exist" error.
This change makes:
qimport --existing --name renametothis thatexistingpatch
equivalent to:
qimport --existing thatexistingpatch; qrename thatexistingpatch renametothis
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 24 Jul 2010 00:28:20 +0900] rev 11698
localrepo: refactor filter computation
Separate loading part from access part to be able to tell with:
repo._loadfilter(name)
bool(name in repo.filterpats)
if there is a 'name' filter available.
Matt Mackall <mpm@selenic.com> [Tue, 27 Jul 2010 16:04:00 -0500] rev 11697
Merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 27 Jul 2010 16:03:42 -0500] rev 11696
Merge with crew
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 27 Jul 2010 14:43:40 +0200] rev 11695
alias: improved diagnostic when arguments include --cwd, etc.
The logic pre-emptively checks for -R, --repo, --repository and --cwd
in order to give the user a more helpful error message. In addition,
each option is handled invididually, which avoids listing them all in
the error.
Before:
% hg --config alias.broken='push --cwd /dev/null' broken
abort: Option --cwd may not be abbreviated!
After:
% hg --config alias.broken='push --cwd /dev/null' broken
error in definition for alias 'broken': --cwd may only be given on the command line