Alexander Solovyov <piranha@piranha.org.ua> [Sun, 25 Oct 2009 12:05:07 +0200] rev 9643
bookmarks: use API to determine if repo is local
Brodie Rao <me+hg@dackz.net> [Sun, 25 Oct 2009 02:53:33 +0200] rev 9642
diffstat: with --git, mark binary files with Bin
Normally, diffs without any text insertions or deletions are reported
as having 0 lines changed by stock diffstat. Compatibility is
preserved with stock diffstat in this case, but when using --git,
binary files are marked with Bin as a means of clarification.
git diff --stat does something similar, though it also includes the
old and new file sizes.
Brodie Rao <me+hg@dackz.net> [Sun, 25 Oct 2009 02:52:36 +0200] rev 9641
color: colorize diff --stat
Brodie Rao <me+hg@dackz.net> [Sun, 25 Oct 2009 02:52:35 +0200] rev 9640
diff: add --stat for diffstat output
diff/qdiff --stat invokes patch.diffstat() on the diff output.
When in interactive mode, the output's maximum width is determined by the
terminal's width.
Brodie Rao <me+hg@dackz.net> [Sun, 25 Oct 2009 02:35:35 +0200] rev 9639
diffstat: print 0 instead of nothing for 0 adds or removes
This is in line with how the stock diffstat behaves when processing a
single diff with no line modifications (like a binary diff).
Gilles Moris <gilles.moris@free.fr> [Sat, 24 Oct 2009 12:29:39 +0200] rev 9638
update tcsh_completion for the new forget and summary commands
Adrian Buehlmann <adrian@cadifra.com> [Sat, 24 Oct 2009 19:01:40 +0200] rev 9637
cmdutil: minor refactoring of changeset_printer._show
- use ctx.branch() instead of directly accessing the extra field "branch"
- move definitions of locals ('extra' and 'branch') down to where they
are used
Martin Geisler <mg@lazybytes.net> [Sat, 24 Oct 2009 00:29:25 +0200] rev 9636
commands: search for translated version of "DEPRECATED"
The option description is already translated at this point, so we must
search for a translation of "DEPRECATED".
Gilles Moris <gilles.moris@free.fr> [Fri, 23 Oct 2009 23:10:05 +0200] rev 9635
mercurial.spec: update requirements for the build
Martin Geisler <mg@lazybytes.net> [Fri, 23 Oct 2009 22:55:28 +0200] rev 9634
convert: document parent order in splicemap help (issue1764)
Pascal Quantin <pascal.quantin@gmail.com> [Thu, 22 Oct 2009 23:41:01 +0200] rev 9633
Add style.css file to Inno Setup script
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 21 Sep 2009 19:21:32 +0200] rev 9632
util: use sys.argv[0] if $HG is unset and 'hg' is not in PATH
This is necessary when the executable name is not 'hg'. For example,
if your system-wide mercurial is name 'hgs', sys.argv[0] is more
accurate than 'hg'.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 21 Oct 2009 14:16:37 +0200] rev 9631
graphlog: hide internal state of ascii() from users
Adrian Buehlmann <adrian@cadifra.com> [Thu, 22 Oct 2009 00:46:54 +0200] rev 9630
doc/hgrc.5.txt: deprecate [defaults]
Quoting Matt:
"Defaults are a bad idea. They are deprecated. Don't use them. Don't
recommend them. Forget they existed. Use aliases."
in http://selenic.com/pipermail/mercurial-devel/2009-October/016095.html
Matt Mackall <mpm@selenic.com> [Wed, 21 Oct 2009 17:54:51 -0500] rev 9629
Merge with crew
Martin Geisler <mg@lazybytes.net> [Thu, 22 Oct 2009 00:30:24 +0200] rev 9628
rst2man: highlight inline literals in bold
The old code would switch to Courier, but that doesn't really help
much in a manpage.
Martin Geisler <mg@lazybytes.net> [Thu, 22 Oct 2009 00:27:08 +0200] rev 9627
rst2man: avoid italic for references
The links to other manpages used both italic and bold text nested
within each other. The \fP (select previous font) macro was used
incorrectly to "reset" the nested fonts resulting in:
<roman> text <italic> <bold> hg <italic> (1) <bold> more text
with no switch back to roman. This stops the bleeding and removes the
ugly italic (underline) from the manpage links.
Martin Geisler <mg@lazybytes.net> [Wed, 21 Oct 2009 23:40:01 +0200] rev 9626
doc: add a style sheet to the generated HTML pages
Matt Mackall <mpm@selenic.com> [Wed, 21 Oct 2009 17:42:22 -0500] rev 9625
summary: remove reference to -p
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 22:43:17 +0200] rev 9624
doc, help: stream-line use of inline-literals
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 22:16:27 +0200] rev 9623
minirst: convert ``foo`` into "foo" upon display
This lets us markup many more occurances of inline literals since they
no longer look strange in the terminal output.
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 22:42:49 +0200] rev 9622
gendoc: fix synopsis
The synopsis is used as an inline literal when generating the manpage.
There should not be any whitespace on the inside of the quotation
marks in inline literals.
Commands with an empty synopsis (such as tags) produces ``tags `` as
synopsis, which triggers a warning.
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 22:39:37 +0200] rev 9621
test-debugcomplete: update output to match a7ef354da662
Matt Mackall <mpm@selenic.com> [Tue, 20 Oct 2009 11:59:38 -0500] rev 9620
summary: add --remote
Matt Mackall <mpm@selenic.com> [Tue, 20 Oct 2009 11:58:09 -0500] rev 9619
summary: restore briefer commit status
Matt Mackall <mpm@selenic.com> [Tue, 20 Oct 2009 11:57:25 -0500] rev 9618
summary: add empty repository and no revision checked out hints
Matt Mackall <mpm@selenic.com> [Mon, 19 Oct 2009 23:53:25 -0500] rev 9617
Merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 20 Oct 2009 00:30:36 +0200] rev 9616
merge with crew
Gilles Moris <gilles.moris@free.fr> [Sun, 18 Oct 2009 14:35:36 +0200] rev 9615
setup: refactor the version string to a subset of tag+tagdist-hash+date
Here is an array summarizing the mercurial version string:
[A] [B] [C] [D]
[1] clone tag clean => tag
[2] clone hash clean => latesttag+latesttagdistance-hash
[3] clone tag dirty => tag+date
[4] clone hash dirty => latesttag+latesttagdistance-hash+date
[5] archive tag clean => tag
[6] archive hash clean => latesttag+latesttagdistance-hash
Column [A]: Mercurial built from an hg *archive* or hg *clone* working directory
Column [B]: revision built has a *tag* or else default to the SHA1 *hash*
Column [C]: working tree *clean* or *dirty*
Column [D]: Mercurial version string
Over the previous version:
- row [5] did return just the node hash, now it returns the tag
- prepend the latest tag and the distance to it to rows [2][4][6]
- append also the date to row [3]; previously, it was just the tag
- the version string is with an empty string to avoid possible TypeError
exceptions during string manipulations
- factorize the function to run hg commands; remove the error message as it is
no more specific to the function.
This scheme enables to have first part of the version strings that can be
compared, whether it has been built from a tagged or untagged revision.
The second part of the version adds a hash for untagged revisions and today's
date if the working tree has local modifications.
As the version string does not contain spaces or special characters, it should
not break script parsing the 'hg version' command and should be usable for use
in file names.
The new code also ensure that the version string has exactly the same version
string, whether it has been built from an archive or from a clone.
Gilles Moris <gilles.moris@free.fr> [Tue, 11 Aug 2009 09:04:02 +0200] rev 9614
archive: add branch and tag informations to the .hg_archival.txt file
Up to this changeset, only the repo (first node) and current node hash were
included. This adds also the named branch and tags.
So the additional lines to .hg_archival.txt are
branch: the named branch
tag: the global tags of this revision, one per line in case of multiple tags
latesttag: if the revision is untagged, the latest tag (most recent in
ancestors), again one per line if this ancestor has multiple tags.
latestagdistance: the longest distance (changesets) to this latest ancestor.
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 00:17:36 +0200] rev 9613
ui: only use "user@host" as username in noninteractive mode
We regularly see people on IRC ask how they can correct commits they
accidentally made without having configured a username. This change
will make Mercurial abort when a commit is made without a username.
If Mercurial is run without a TTY (from a cronjob or similar), a
username is constructed as usual. Schematically the changes are as
follows:
With ui.askusername=False:
old new
interactive user@host abort
noninteractive user@host user@host
With ui.askusername=True:
old new
interactive prompt prompt
noninteractive user@host user@host
Alexander Solovyov <piranha@piranha.org.ua> [Mon, 19 Oct 2009 23:27:20 +0300] rev 9612
fix patchbomb prompt when sending series of patches
Adrian Buehlmann <adrian@cadifra.com> [Fri, 16 Oct 2009 23:57:34 +0200] rev 9611
hg.clone: report branch name on update
Alexander Solovyov <piranha@piranha.org.ua> [Mon, 19 Oct 2009 22:19:28 +0300] rev 9610
make path expanding more consistent
This expands ~user and $FOO constructs in ui.ignore files, [defaults],
[paths], extension paths, and HGRCPATH files.
Henrik Stuart <hg@hstuart.dk> [Sat, 17 Oct 2009 15:40:34 +0200] rev 9609
tests: fix inadvertent use of existing test repository
David Soria Parra <dsp@php.net> [Mon, 19 Oct 2009 07:14:44 +0200] rev 9608
commands: clarify output for the commit summary
It is not clear what is meant with '2 modified, 3 unknown'. We clarify
this by writing '2 modified files, 3 unknown files' instead.
Martin Geisler <mg@lazybytes.net> [Mon, 19 Oct 2009 14:37:37 +0200] rev 9607
commands: do not split a translated string
Splitting the string after translation relies on the implicit
assumption that translators will always translate the English words
using single foreign words.
Also, when translating we want as much context as possible so I've
moved the string formatting into the translatable string.
Matt Mackall <mpm@selenic.com> [Mon, 19 Oct 2009 00:36:52 -0500] rev 9606
Remove parents from default help in favor of summary
Matt Mackall <mpm@selenic.com> [Mon, 19 Oct 2009 00:22:49 -0500] rev 9605
summary: quieter with -q
Matt Mackall <mpm@selenic.com> [Mon, 19 Oct 2009 00:21:06 -0500] rev 9604
commands: fix missing empty synopses
Matt Mackall <mpm@selenic.com> [Sun, 18 Oct 2009 22:31:05 -0500] rev 9603
Introduce summary command
Mads Kiilerich <mads@kiilerich.com> [Fri, 16 Oct 2009 11:19:39 +0200] rev 9602
Merge with redone c655432c2c24 (issue1860)
Mads Kiilerich <mads@kiilerich.com> [Fri, 16 Oct 2009 11:18:38 +0200] rev 9601
Dummy-merge with c655432c2c24 (issue1860)
Mads Kiilerich <mads@kiilerich.com> [Fri, 16 Oct 2009 11:16:42 +0200] rev 9600
Redo c655432c2c24 (issue1860)
Martin Geisler <mg@lazybytes.net> [Fri, 16 Oct 2009 00:45:18 +0200] rev 9599
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Fri, 16 Oct 2009 00:06:23 +0200] rev 9598
Merge with crew-stable
Bryan O'Sullivan <bos@serpentine.com> [Tue, 13 Oct 2009 13:43:55 -0700] rev 9597
Merge with mpm
Lee Cantey <lcantey@gmail.com> [Tue, 13 Oct 2009 12:27:50 -0700] rev 9596
README: revert accidental commit
Lee Cantey <lcantey@gmail.com> [Tue, 13 Oct 2009 12:23:23 -0700] rev 9595
test-gendoc: adjust output to account for Swedish translation
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 11 Oct 2009 21:32:55 +0200] rev 9594
merge with mpm
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 10 Oct 2009 12:24:09 +0200] rev 9593
merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 10 Oct 2009 12:23:42 +0200] rev 9592
merge with mpm
Patrick Mezard <pmezard@gmail.com> [Fri, 09 Oct 2009 00:29:39 +0200] rev 9591
Merge with crew-stable
Benoit Allard <benoit@aeteurope.nl> [Fri, 16 Oct 2009 00:09:18 +0200] rev 9590
mq: fix traceback for qpush inexistant-patch with no patch applied
timeless@mozdev.org [Wed, 14 Oct 2009 20:55:39 +0300] rev 9589
rebase: change rebase help to talk about changesets and branch names
Stephen Rasku <mercurial@srasku.net> [Wed, 14 Oct 2009 21:21:09 -0700] rev 9588
mq: changed help for qpop -f to reflect actual behaviour
Patrick Mezard <pmezard@gmail.com> [Thu, 15 Oct 2009 23:15:30 +0200] rev 9587
convert/svn: better error when hg cannot call itself (issue1838)
Patrick Mezard <pmezard@gmail.com> [Thu, 15 Oct 2009 23:15:30 +0200] rev 9586
patch: handle symlink updates/replacements (issue1785)
Patrick Mezard <pmezard@gmail.com> [Thu, 15 Oct 2009 23:15:30 +0200] rev 9585
patch: handle symlinks without symlinkhunk
Symlink creations and deletions were handled with a special symlinkhunk object,
working like a binary hunk. However, this model does not support symlink
updates or replacements, so we teach regular hunks how to handle symlinks.
Matt Mackall <mpm@selenic.com> [Mon, 12 Oct 2009 18:25:46 -0500] rev 9584
bisect: use util.system and fix good/bad when using -c
The existing scheme using util.find_exe and subprocess.call meant we
couldn't use simple shell commands in tests. Fix that.
Also, it mistakenly used status from the system() call rather than
good from the bisect call in reporting results.
Matt Mackall <mpm@selenic.com> [Mon, 12 Oct 2009 14:59:28 -0500] rev 9583
bisect: limit considered set to descendants of first good rev
Matt Mackall <mpm@selenic.com> [Mon, 12 Oct 2009 14:52:53 -0500] rev 9582
tests: add -k to test scripts matching keywords
argument is a space-separated list of keywords that are searched for
in the name and body of each test. This makes it easy to run only
tests related to tags, hgweb, revert, etc. (eg -k "tag hgweb revert").
Raoul Bhatia [IPAX] <r.bhatia@ipax.at> [Fri, 09 Oct 2009 16:27:05 +0200] rev 9581
use short identifiers in atom feed
Matt Mackall <mpm@selenic.com> [Sun, 11 Oct 2009 13:58:53 -0500] rev 9580
run-tests: add --noskips option
Brodie Rao <me+hg@dackz.net> [Fri, 09 Oct 2009 03:53:24 -0400] rev 9579
color: add test for record support
Sune Foldager <cryo@cyanite.org> [Thu, 08 Oct 2009 10:39:43 +0200] rev 9578
rebase: return early when source is descendant of destination
This only happens when using --base (or no source selection options), as
rebase already aborts in this situation when using --source.
Without this change you get an abort from the underlying merge, and the
repository is in a different state than you started with (the working
dir parent is changed).
Sune Foldager <cryo@cyanite.org> [Thu, 08 Oct 2009 10:07:41 +0200] rev 9577
rebase: improve error and debug messages
Matt Mackall <mpm@selenic.com> [Sun, 11 Oct 2009 13:54:19 -0500] rev 9576
Merge with stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 10 Oct 2009 12:19:58 +0200] rev 9575
merge with hg-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 10 Oct 2009 12:00:43 +0200] rev 9574
encoding: fix issue with non-standard UTF-8 CTYPE on OS X
Patrick Mezard <pmezard@gmail.com> [Thu, 08 Oct 2009 23:42:33 +0200] rev 9573
patch: do not swallow header-like patch first line (issue1859)
Current solution is hackish but looks like a good trade-off short of rewriting
patch.extract() significantly.
Patrick Mezard <pmezard@gmail.com> [Thu, 08 Oct 2009 23:32:36 +0200] rev 9572
windows: fix unlink() not dropping empty tree (issue1861)
Matt Mackall <mpm@selenic.com> [Thu, 08 Oct 2009 01:17:48 -0500] rev 9571
merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 08 Oct 2009 01:17:24 -0500] rev 9570
merge with i18n-stable
Matt Mackall <mpm@selenic.com> [Thu, 08 Oct 2009 01:16:32 -0500] rev 9569
Merge with i18n
Fabian Kreutz <fabian.kreutz@starnet.fi> [Tue, 06 Oct 2009 11:18:58 +0300] rev 9568
i18n-de: Translate extdiff, gpg, graphlog and fix some fuzzies
Martin Geisler <mg@lazybytes.net> [Wed, 30 Sep 2009 21:14:24 +0200] rev 9567
Merge with hg-i18n-stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 28 Sep 2009 20:14:39 -0300] rev 9566
i18n-pt_BR: synchronized with a1ee850f49e3
Martin Geisler <mg@lazybytes.net> [Tue, 29 Sep 2009 00:54:15 +0200] rev 9565
Merge with hg-i18n-stable
Martin Geisler <mg@lazybytes.net> [Mon, 28 Sep 2009 00:45:47 +0200] rev 9564
Merge with hg-i18n-stable
Martin Geisler <mg@lazybytes.net> [Thu, 17 Sep 2009 00:43:25 +0200] rev 9563
i18n-da: synchronized with 812aaef40757
Martin Geisler <mg@lazybytes.net> [Wed, 16 Sep 2009 23:46:06 +0200] rev 9562
Merge with main
Martin Geisler <mg@lazybytes.net> [Wed, 16 Sep 2009 16:11:44 +0200] rev 9561
i18n-de: correct indentation of verbatim blocks
Martin Geisler <mg@lazybytes.net> [Wed, 16 Sep 2009 15:41:39 +0200] rev 9560
i18n-de: correct errors reported by msgfmt
Fabian Kreutz <fabian.kreutz@starnet.fi> [Wed, 16 Sep 2009 14:14:06 +0300] rev 9559
i18n-de: Translation of convert + more syntax fixes
Fabian Kreutz <fabian.kreutz@starnet.fi> [Mon, 14 Sep 2009 09:14:36 +0300] rev 9558
i18n-de: redid latest translations
Originally by Simon H., Tobias and myself.
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 08 Sep 2009 19:46:20 -0300] rev 9557
merge with i18n-stable
Jens Bäckman <jens.backman@gmail.com> [Tue, 18 Aug 2009 08:49:41 +0200] rev 9556
i18n-sv: Start Swedish translation
This is the starting point for the Swedish translation efforts. It
currently contains only the help of the first 17 basic commands.
Martin Geisler <mg@lazybytes.net> [Thu, 13 Aug 2009 20:12:34 +0200] rev 9555
i18n: merge with pt_BR
Wagner Bruna <wbruna@yahoo.com> [Wed, 12 Aug 2009 11:45:47 -0300] rev 9554
i18n-pt_BR: synchronized with 4e7149ed98e8
Wagner Bruna <wbruna@yahoo.com> [Wed, 12 Aug 2009 11:42:21 -0300] rev 9553
merge with i18n-stable
Matt Mackall <mpm@selenic.com> [Thu, 08 Oct 2009 00:59:46 -0500] rev 9552
Merge with -stable
Kevin Bullock <kbullock@ringworld.org> [Wed, 07 Oct 2009 14:01:20 -0500] rev 9551
color: allow multiple args to ui.write()
TK Soh <teekaysoh@gmail.com> [Thu, 08 Oct 2009 09:27:22 +0800] rev 9550
color: add support for record extension
Adrian Buehlmann <adrian@cadifra.com> [Wed, 07 Oct 2009 20:32:07 +0200] rev 9549
util: move rename into posix.py and windows.py
Adrian Buehlmann <adrian@cadifra.com> [Wed, 07 Oct 2009 20:16:43 +0200] rev 9548
util: state docstring of rename more precisely