Renato Cunha <renatoc@gmail.com> [Fri, 02 Jul 2010 16:21:40 -0300] rev 11535
util.h: Defined macros for working "with" PyStrings in py3k.
PyString* functions are defined as PyUnicode* to permit correct compilation in
both python 2.x and 3.x.
Renato Cunha <renatoc@gmail.com> [Fri, 02 Jul 2010 16:21:38 -0300] rev 11534
util.h: Add a PyInt_AsLong definition for usage in the inotify module.
Renato Cunha <renatoc@gmail.com> [Fri, 02 Jul 2010 16:21:36 -0300] rev 11533
setup.py: Add 'mercurial' as include dir for the inotify compiler.
This patch adds access to util.h for the inotify C module by adding the
"mercurial" directory as an include dir, enabling access to the macros defined
in util.h.
Renato Cunha <renatoc@gmail.com> [Fri, 02 Jul 2010 16:21:34 -0300] rev 11532
setup.py: Adjustments to make setup.py run in py3k.
In py3k, subprocess.Popen.communicate's output are bytes objects. String
literals are Unicode objects. Thus, when a bytes object startswith method is
called, with string literals, it fails. What this patch does is:
* Convert the string (unicode in py3k) literals to bytes objects;
* As "bytes" is not a builtin in python < 2.6, it defines a "b" helper
function that merely returns its argument, as suggested by Antoine Pitrou.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 13 Jul 2010 20:12:32 +0900] rev 11531
rebase: re-add patches to mq repo after rebase
Since 1b82a26635d7, we are adding patches after the qimport call, and not
inside it anymore. Correct updatemq to match the new behaviour.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 12 Jul 2010 17:55:23 +0900] rev 11530
mq: reset self.added after the mq transaction instead of inside qimport
It seems wiser to reset mq.added at the end of the mq transaction instead of at
the beginning of a qimport call: this way, calling several times qimport()
without saving mq state in-between does not overwrite the previous value of
mq.added (this happens, for example in rebase, where we import several patches
in a batch before calling .save_dirty() )
Matt Mackall <mpm@selenic.com> [Mon, 12 Jul 2010 17:27:32 -0500] rev 11529
Merge with stable
Wagner Bruna <wbruna@yahoo.com> [Sat, 10 Jul 2010 14:28:38 -0300] rev 11528
i18n-pt_BR: synchronized with dec57aa0f8ca
Wagner Bruna <wbruna@yahoo.com> [Sat, 10 Jul 2010 14:01:10 -0300] rev 11527
merge with stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 08 Jul 2010 15:36:14 -0300] rev 11526
i18n-pt_BR: synchronized with 9d905b9769af
Martin Geisler <mg@aragost.com> [Fri, 09 Jul 2010 14:21:45 +0200] rev 11525
Merge with stable
Steve Losh <steve@stevelosh.com> [Wed, 07 Jul 2010 18:49:43 -0400] rev 11524
dispatch: add shell aliases
This patch adds git-style "shell aliases" to Mercurial.
Any alias with a definition beginning with a '!' will be treated as a shell
alias. For example:
[alias]
echo = !echo
qempty = !hg qrefresh -X "`hg root`" ; echo Emptied patch "`hg qtop`"
$ hg echo foo
foo
$ hg qempty
Emptied patch foo
$
Mads Kiilerich <mads@kiilerich.com> [Thu, 08 Jul 2010 15:44:14 +0200] rev 11523
convert: cleanup of filemap help text
Clarify that:
- Specified paths are matched by comparing name of file or directory.
- Line order (thus) doesn't matter.
- Rename doesn't imply include.
Martin Geisler <mg@aragost.com> [Fri, 09 Jul 2010 14:01:55 +0200] rev 11522
check-code: add test for callable
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Fri, 09 Jul 2010 11:04:00 +0200] rev 11521
extensions: add a few assertions to wrapfunction() and wrapcommand().
Specifically, assert that the given wrapper is callable in both
functions, and assert that the original was also callable in
wrapfunction().
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Fri, 09 Jul 2010 11:13:45 +0200] rev 11520
extensions: improve language for wrapfunction() docstring.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Fri, 09 Jul 2010 10:57:57 +0200] rev 11519
extensions: add docstring for wrapcommand().
Arnab Bose <hirak99@gmail.com> [Fri, 09 Jul 2010 13:31:37 +0200] rev 11518
commands: mention "hg status -C" in addremove help
Martin Geisler <mg@aragost.com> [Wed, 07 Jul 2010 14:29:40 +0200] rev 11517
Merge with stable
Martin Geisler <mg@aragost.com> [Wed, 07 Jul 2010 14:13:23 +0200] rev 11516
test-merge-closedheads: test cc982ff2dcf8
Robert Bauck Hamar <r.b.hamar@usit.uio.no> [Wed, 07 Jul 2010 14:11:59 +0200] rev 11515
commands: only warn when reopening the workdir's branch
When commiting, a check is made to see if one of the parents is a
closed head. However this did not check that the branch of the commit
is the same as the closed head, so one could get a warning message on
the sequence
hg commit --close-branch
hg branch new-branch
hg commit
or when merging in a closed head.
Martin Geisler <mg@lazybytes.net> [Tue, 06 Jul 2010 20:43:19 +0200] rev 11514
Merge with stable
Yuya Nishihara <yuya@tcha.org> [Sun, 28 Mar 2010 15:23:11 +0900] rev 11513
mq: fixed ENOENT when qrename to new/directory.patch
MQ patch name can contain slashes, e.g. 'foo/bar.patch'.
Currently "qnew foo/bar.patch" works, but
"qrename foo/bar.patch new/dir.patch" fails with
"No such file or directory".
Also added test case for "qnew foo/bar.patch"
Julian Cowley <julian@lava.net> [Fri, 02 Jul 2010 14:14:30 -1000] rev 11512
mercurial.spec: rename docutils to python-docutils in BuildRequires
Even though the name of the project is Docutils, most packagers use
the package name python-docutils to fit into the naming scheme of
other packages written in Python. The name is used by Fedora, EPEL,
DAG, Mandriva, and a few other distributions.
Renato Cunha <renatoc@gmail.com> [Tue, 06 Jul 2010 13:10:16 -0300] rev 11511
glossary: fixed typo in "Directory, working" description
The term "Directory, working" referenced a non-existant term named "Parents,
working directory". This patch fixes the typo.
Martin Geisler <mg@lazybytes.net> [Sun, 04 Jul 2010 14:14:40 +0200] rev 11510
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sun, 04 Jul 2010 14:14:29 +0200] rev 11509
test-log: also test "log -p -R" case
Yuya Nishihara <yuya@tcha.org> [Fri, 02 Jul 2010 23:49:06 +0900] rev 11508
log: fix missing diff output for hg log -p in sub directory
prep(ctx, fns) receives paths relative to repository root, not cwd.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 04 Jul 2010 17:05:17 +0900] rev 11507
commands: document return values of add and paths commands
Martin Geisler <mg@lazybytes.net> [Sat, 03 Jul 2010 02:15:25 +0200] rev 11506
mergetools.hgrc: add vimdiff
Imported from deb_specific__mergetools patch in Debians patch queue:
http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/
Martin Geisler <mg@lazybytes.net> [Sat, 03 Jul 2010 02:06:07 +0200] rev 11505
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sat, 03 Jul 2010 01:56:09 +0200] rev 11504
zeroconf: small fixes in docstring
Use reST role for consistency, import small part of Debian's
proposed_upstream__correct-zeroconf-doc patch from
http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/
Martin Geisler <mg@lazybytes.net> [Sat, 03 Jul 2010 02:03:55 +0200] rev 11503
hgweb: add link to wiki
Martin Geisler <mg@lazybytes.net> [Sat, 03 Jul 2010 01:48:50 +0200] rev 11502
hgweb.wsgi: add a URL to the corresponding wiki documentation
Imported for_upstream__add_doc_url_in_example_files.patch from
Debian's patch queue:
http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/
Renato Cunha <renatoc@gmail.com> [Thu, 01 Jul 2010 19:27:03 -0300] rev 11501
churn: remove tuple parameter unpacking (deprecated in py3k)
Renato Cunha <renatoc@gmail.com> [Thu, 01 Jul 2010 19:27:03 -0300] rev 11500
record: removed 'reduce' calls (unsupported by py3k)
Quoting python's documentation, "Note that sum(range(n), m) is
equivalent to reduce(operator.add, range(n), m)". The "sum" function
is a builtin from 2.3 on and there's no reason for not to use it.
Renato Cunha <renatoc@gmail.com> [Thu, 01 Jul 2010 19:27:03 -0300] rev 11499
record: tuple parameter unpacking is deprecated in py3k
Renato Cunha <renatoc@gmail.com> [Thu, 01 Jul 2010 19:27:02 -0300] rev 11498
convert: tuple parameter unpacking is deprecated in py3k
Renato Cunha <renatoc@gmail.com> [Thu, 01 Jul 2010 19:27:02 -0300] rev 11497
revlog: Marked classic int divisions as such.
Martin Geisler <mg@aragost.com> [Fri, 02 Jul 2010 11:41:43 +0200] rev 11496
Merge with stable (again)
Mads Kiilerich <mads@kiilerich.com> [Wed, 30 Jun 2010 17:23:16 +0200] rev 11495
debugger: give a little intro before entering pdb
Mads Kiilerich <mads@kiilerich.com> [Wed, 30 Jun 2010 17:20:42 +0200] rev 11494
debugger: show traceback before entering pdb post-mortem
Martin Geisler <mg@aragost.com> [Fri, 02 Jul 2010 11:30:57 +0200] rev 11493
Merge with stable
Steve Borho <steve@borho.org> [Thu, 01 Jul 2010 19:13:23 -0500] rev 11492
wix: generate a new GUID for the help folder
A GUID change is recommended after changes like 159233cc9c14
Steve Borho <steve@borho.org> [Thu, 01 Jul 2010 12:53:37 -0500] rev 11491
wix: pick up new help topics added between 1.5 and 1.6
These files are not included the 1.6.0 installer, but will be picked up by
nightly builds as soon as this makes it to the stable branch.
Matt Mackall <mpm@selenic.com> [Thu, 01 Jul 2010 12:06:31 -0500] rev 11490
Added signature for changeset f786fc4b8764
Matt Mackall <mpm@selenic.com> [Thu, 01 Jul 2010 12:06:30 -0500] rev 11489
Added tag 1.6 for changeset f786fc4b8764
Mads Kiilerich <mads@kiilerich.com> [Tue, 29 Jun 2010 12:12:34 +0200] rev 11488
log: follow filenames through renames (issue647)
In commands.log a displayer was initialized from
cmdutil.show_changeset() with the initial matchfn (which designates
the specified files which only is correct in the highest revision in
the range). prep() is handed the correct list of files, but
displayer.show() didn't use that list but keept using the original
matchfn.
The matchfn argument to cmdutil.show_changeset() wasn't specified in
other places and is only used in .show(), so now we give the matchfn
as an optional parameter to .show().
We do however still have to detect --patch and --stat from opts in
show_changeset() and let it imply a matchall, but that can now be
overruled with the new .show() matchfn parameter.
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 01 Jul 2010 13:26:08 -0300] rev 11487
i18n-pt_BR: synchronized with d3c3e2fdeb0c
Matt Mackall <mpm@selenic.com> [Thu, 01 Jul 2010 11:22:56 -0500] rev 11486
commit: add missing _()
Matt Mackall <mpm@selenic.com> [Thu, 01 Jul 2010 11:20:13 -0500] rev 11485
subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232)
Matt Mackall <mpm@selenic.com> [Thu, 01 Jul 2010 11:20:08 -0500] rev 11484
Merge with i18n
Martin Geisler <mg@aragost.com> [Thu, 01 Jul 2010 15:25:29 +0200] rev 11483
i18n-da: translated eol extension and various small strings
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 30 Jun 2010 13:03:48 +0900] rev 11482
i18n-ja: synchronized with 13d02d6677f2
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 29 Jun 2010 12:27:08 -0300] rev 11481
i18n-pt_BR: synchronized with 59af1d65029c
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 29 Jun 2010 12:18:42 -0300] rev 11480
merge with stable
Jens Bäckman <jens.backman@gmail.com> [Tue, 29 Jun 2010 09:11:55 +0200] rev 11479
i18n-sv: synchronized with 13d02d6677f2
Wagner Bruna <wbruna@yahoo.com> [Sat, 26 Jun 2010 21:37:10 -0300] rev 11478
i18n-pt_BR: synchronized with 9fa255c32406
Wagner Bruna <wbruna@yahoo.com> [Sat, 26 Jun 2010 21:29:39 -0300] rev 11477
Merge with stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 23 Jun 2010 17:54:59 -0300] rev 11476
i18n-pt_BR: glossary.txt translation
Jens Bäckman <jens.backman@gmail.com> [Wed, 23 Jun 2010 09:33:28 +0200] rev 11475
i18n-sv: output from 'hg' is once again fully Swedish
Jens Bäckman <jens.backman@gmail.com> [Wed, 23 Jun 2010 09:10:54 +0200] rev 11474
i18n-sv: synchronized with 469a48dff18b
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 22 Jun 2010 21:13:18 -0300] rev 11473
i18n-pt_BR: synchronized with 2186124f08e4
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 22 Jun 2010 20:48:48 -0300] rev 11472
Merge with stable
Jens Bäckman <jens.backman@gmail.com> [Tue, 22 Jun 2010 09:43:07 +0200] rev 11471
i18n-sv: synchronized with 4d03c3680400
Matt Mackall <mpm@selenic.com> [Wed, 30 Jun 2010 23:56:35 -0500] rev 11470
subrepo: correctly handle update -C with modified subrepos (issue2022)
(based on a patch by Saint Germain)
Maxim Khitrov <mkhitrov@gmail.com> [Wed, 30 Jun 2010 18:15:23 -0500] rev 11469
http: deliver hook output to client
Christian Boos <cboos@neuf.fr> [Wed, 23 Jun 2010 13:44:07 +0200] rev 11468
setup: ignore failures to build optional inotify extension
Matt Mackall <mpm@selenic.com> [Wed, 30 Jun 2010 17:44:36 -0500] rev 11467
revset: make negate work for sort specs
Matt Mackall <mpm@selenic.com> [Wed, 30 Jun 2010 17:34:20 -0500] rev 11466
update: synchronize permissions in the dirstate (issue1473)
fix by Benoit, updated by mpm to not affect all clean files
Simon Howkins <simonh@symbian.org> [Thu, 24 Jun 2010 15:18:47 +0100] rev 11465
heads: fix templating of headers again (issue2130)
(tweaks and test by mpm)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 30 Jun 2010 12:44:58 +0900] rev 11464
minirst: use unicode string as intermediate form for replacement
Some character encodings use ASCII characters other than
control/alphabet/digit as a part of multi-bytes characters, so direct
replacing with such characters on strings in local encoding causes
invalid byte sequences.
Matt Mackall <mpm@selenic.com> [Tue, 29 Jun 2010 17:30:42 -0500] rev 11463
subrepo: fix recording of + in .hgsubstate (issue2217)
Vishakh H <vsh426@gmail.com> [Tue, 29 Jun 2010 03:09:42 +0530] rev 11462
mq: qimport cleanup on fail (issue2214)
save state of successfully added patches and ensure
cleanup on the way out.
Mads Kiilerich <mads@kiilerich.com> [Mon, 28 Jun 2010 23:23:55 +0200] rev 11461
test-acl: don't use $PWD
solaris ....
Mads Kiilerich <mads@kiilerich.com> [Mon, 28 Jun 2010 23:16:11 +0200] rev 11460
test-alias: don't use the environment variable PWD
solaris ...
Mads Kiilerich <mads@kiilerich.com> [Mon, 28 Jun 2010 15:08:01 +0200] rev 11459
revert: Make it clearer when not to use revert
Augie Fackler <durin42@gmail.com> [Sun, 27 Jun 2010 22:20:47 -0500] rev 11458
progress: check stderr.isatty() before each print
This prevents writing progress information to a non-tty stderr if one is
swapped in after startup, which happens in `hg serve`.
Mads Kiilerich <mads@kiilerich.com> [Sat, 26 Jun 2010 23:00:58 +0200] rev 11457
http digest auth: reset redirect counter on new requests (issue2255)
This fixes a regression introduced in a1e575b48563 when Mercurial reuses the
auth handler for several requests and the redirect counter never is reset.
Matt Mackall <mpm@selenic.com> [Mon, 28 Jun 2010 11:07:27 -0500] rev 11456
revset: deal with empty sets in range endpoints
(spotted by Julian Cowley <julian@lava.net>)
Matt Mackall <mpm@selenic.com> [Sun, 27 Jun 2010 18:20:49 -0500] rev 11455
subrepo: fix silent push failure for SVN (issue2241)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Fri, 18 Jun 2010 08:49:24 +0200] rev 11454
merge: pass constant cset ancestor to fctx.ancestor
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Fri, 18 Jun 2010 08:48:05 +0200] rev 11453
context: allow passing the common cset ancestor to fctx.ancestor
This is used by the next patch to speed up merge.applyupdates.
Matt Mackall <mpm@selenic.com> [Sun, 27 Jun 2010 17:41:43 -0500] rev 11452
merge: document how to 'undo' a merge
Martin Geisler <mg@lazybytes.net> [Sun, 27 Jun 2010 23:12:05 +0200] rev 11451
resolve: do not crash on empty mergestate
I managed to get an empty .hg/merge/state file by interrupting a merge
by pressing Control-C. This lead to this error:
TypeError: a2b_hex() argument 1 must be string or read-only buffer,
not None
since localnode is assigned None before the iteration over lines in
the mergestate begins.
Julian Cowley <julian@lava.net> [Wed, 23 Jun 2010 16:54:12 -1000] rev 11450
revset: fix spelling typo
Julian Cowley <julian@lava.net> [Fri, 11 Jun 2010 01:35:38 -1000] rev 11449
parser: fix URL to effbot
Eric Eisner <ede@mit.edu> [Thu, 24 Jun 2010 21:35:52 -0700] rev 11448
glog: fix crash on empty revision range
Mads Kiilerich <mads@kiilerich.com> [Fri, 25 Jun 2010 19:59:22 +0200] rev 11447
mercurial.spec: don't include convert-repo - use "hg convert" instead
Julian Cowley <julian@lava.net> [Fri, 25 Jun 2010 01:27:25 -1000] rev 11446
revset: remove debugging leftover
Gilles Moris <gilles.moris@free.fr> [Sat, 26 Jun 2010 15:56:48 +0200] rev 11445
contrib: update tcsh_completion with commands for 1.6
Added the following commands: debugbuilddag debugdag debugpushkey
debugrevspec.
Matt Mackall <mpm@selenic.com> [Sat, 26 Jun 2010 12:26:03 -0500] rev 11444
bookmarks: fix in/out return values
Matt Mackall <mpm@selenic.com> [Sat, 26 Jun 2010 12:24:55 -0500] rev 11443
bookmarks: fix bogus cut and paste for outgoing
Matt Mackall <mpm@selenic.com> [Fri, 25 Jun 2010 13:47:28 -0500] rev 11442
addchangegroup: pass in lock to release it before changegroup hook is called
Currently, callers of addchangegroup first acquire the repository
lock, usually to check that an unbundle request isn't racing. This
means that changegroup hook actions that might write to a repo get
stuck waiting for a lock. Here, we add a new optional lock parameter
and update all the callers. Post-1.6 we may make it non-optional.
Simon Howkins <simonh@symbian.org> [Thu, 24 Jun 2010 15:18:47 +0100] rev 11441
cmdutil: only output style header once in non-buffered mode (issue2130)
Matt Mackall <mpm@selenic.com> [Wed, 23 Jun 2010 13:38:52 -0500] rev 11440
bookmarks: touch changelog on write to force hgweb reload