Adrian Buehlmann <adrian@cadifra.com> [Thu, 06 Sep 2012 15:04:07 +0200] rev 17452
test-hybridencode: testing dir levels and dir prefix lenghts of hashed paths
Patrick Mezard <patrick@mezard.eu> [Wed, 05 Sep 2012 22:01:09 +0200] rev 17451
histedit: fix unused variable warnings spotted by pyflakes
Patrick Mezard <patrick@mezard.eu> [Fri, 03 Aug 2012 17:26:58 +0200] rev 17450
test-convert-mtn.t: generate files in binary mode
Patrick Mezard <patrick@mezard.eu> [Fri, 03 Aug 2012 17:26:30 +0200] rev 17449
test-convert-mtn.t: use #if to set mtndir to the correct value
Monotone store directory name is not the same on Windows and Unix.
Patrick Mezard <patrick@mezard.eu> [Fri, 03 Aug 2012 17:56:34 +0200] rev 17448
test-convert-darcs.t: fix elementtree test
On OSX, the test succeeds because darcs aborts when trying to convert
the dummy repository, and the test only grep for the output. On Windows,
the darcs call succeeds for some reason but darcs fails to emit any output,
which is not a valid XML output, which causes a traceback including the
ElementTree string matched by the check, and makes a false positive.
Check with a real repository instead. The darcs upgrade test is moved
at the end so we can use our handmade darcs repository for the test.
Patrick Mezard <patrick@mezard.eu> [Fri, 03 Aug 2012 17:59:21 +0200] rev 17447
test-convert-svn-branches.t: fix self call failure on Windows
The error message is preceded by a cmd.exe error.
Sumeet <sumeet@fb.com> [Mon, 27 Aug 2012 12:41:10 -0700] rev 17446
record: checks for valid username before starting recording process (issue3456)
Adrian Buehlmann <adrian@cadifra.com> [Wed, 05 Sep 2012 14:08:31 +0200] rev 17445
test-hybridencode: test full range of ASCII codes from 126 to 255
Adrian Buehlmann <adrian@cadifra.com> [Wed, 05 Sep 2012 13:57:58 +0200] rev 17444
test-hybridencode: remove x00 character case
precludes implementation in C
Bryan O'Sullivan <bryano@fb.com> [Tue, 04 Sep 2012 15:50:42 -0700] rev 17443
Merge with crew-stable
Bryan O'Sullivan <bryano@fb.com> [Tue, 04 Sep 2012 15:50:15 -0700] rev 17442
Merge
Bryan O'Sullivan <bryano@fb.com> [Tue, 04 Sep 2012 15:46:04 -0700] rev 17441
subrepo: encode unicode path names (issue3610)
Subversion 1.7 changes its XML output to include an explicit encoding tag:
<?xml version="1.0" encoding="UTF-8"?>
This triggers xml.dom.minidom to always return unicode strings, causing
other parts of the code to explode.
We unconditionally encode path names before handing them back, which
works with both str (actually a no-op) and unicode values.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 31 Aug 2012 13:08:11 +0200] rev 17440
test-hybridencode: add more testcases for hashed paths
Bryan O'Sullivan <bryano@fb.com> [Tue, 04 Sep 2012 13:50:50 -0700] rev 17439
Merge with crew-stable
Bryan O'Sullivan <bryano@fb.com> [Tue, 04 Sep 2012 13:50:22 -0700] rev 17438
Merge
Bryan O'Sullivan <bryano@fb.com> [Tue, 04 Sep 2012 13:49:39 -0700] rev 17437
Merge with stable
Bryan O'Sullivan <bryano@fb.com> [Tue, 04 Sep 2012 13:49:10 -0700] rev 17436
Merge
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 31 Aug 2012 23:42:02 +0200] rev 17435
merge with crew-stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 30 Aug 2012 22:13:24 +0200] rev 17434
test: remove invalid hidden rev in graphlog test
The hidden set of revision can not have descendant outside this set.
The extension is patched to raise and exception when this happen.
Patrick Mezard <patrick@mezard.eu> [Wed, 29 Aug 2012 21:26:39 +0200] rev 17433
Merge with stable
Adrian Buehlmann <adrian@cadifra.com> [Wed, 29 Aug 2012 11:48:36 +0200] rev 17432
test-hybridencode: more testcases
Mads Kiilerich <mads@kiilerich.com> [Wed, 29 Aug 2012 01:24:57 +0200] rev 17431
remove template-vars.txt - it is outdated and neither usable nor necessary
Mads Kiilerich <mads@kiilerich.com> [Mon, 27 Aug 2012 23:17:21 +0200] rev 17430
largefiles: minor code cleanup
Fix:
* unnecessary use of map and lambda
* comment instead of readable code
* comparing None with 0
* and...or anti-pattern for 'ternary if' with very clever handling of i=None
Mads Kiilerich <mads@kiilerich.com> [Mon, 27 Aug 2012 23:16:22 +0200] rev 17429
declare local constants instead of using magic values and comments
Mads Kiilerich <mads@kiilerich.com> [Mon, 27 Aug 2012 23:14:27 +0200] rev 17428
avoid using abbreviations that look like spelling errors
Mads Kiilerich <mads@kiilerich.com> [Tue, 21 Aug 2012 02:41:20 +0200] rev 17427
improve some comments and docstrings, fixing issues found when spell checking
Mads Kiilerich <mads@kiilerich.com> [Tue, 21 Aug 2012 02:41:20 +0200] rev 17426
delete some dead comments and docstrings
Mads Kiilerich <mads@kiilerich.com> [Wed, 15 Aug 2012 22:39:18 +0200] rev 17425
fix wording and not-completely-trivial spelling errors and bad docstrings
Mads Kiilerich <mads@kiilerich.com> [Wed, 15 Aug 2012 22:38:42 +0200] rev 17424
fix trivial spelling errors
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 31 Aug 2012 23:27:26 +0200] rev 17423
strip: fix revset usage (issue3604)
The `repair` code builds a giant revset query instead of using the "%lr" idiom.
It is inefficient and crash when the number of stripped changeset is too big.
This changeset replaces the bad code by a better revset usage.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 02 Aug 2012 13:51:49 +0200] rev 17422
mergetools.hgrc: set vimdiff to check=changed
The standard reaction in from of unexpected vimdiff is to ":quit". This will
make vimdiff return a 0 status even if no merge were done at all.
This change detect that nothing have been changed in vimdiff as a potential
unresolved conflict.
Mads Kiilerich <mads@kiilerich.com> [Wed, 29 Aug 2012 02:09:43 +0200] rev 17421
hgweb: avoid bad $$ processing in graph (issue3601)
JavaScript .replace always magically processed $$ $& $' $` in replacement
strings and thus displayed subject lines incorrectly in the graph view.
Instead of regexps and .replace we now just create the strings the right way in
the first place.
Steve Borho <steve@borho.org> [Wed, 29 Aug 2012 13:16:56 -0500] rev 17420
wix: pick up new template files
Matt Mackall <mpm@selenic.com> [Sat, 01 Sep 2012 12:49:43 -0500] rev 17419
Added signature for changeset 072209ae4ddb
Matt Mackall <mpm@selenic.com> [Sat, 01 Sep 2012 12:49:39 -0500] rev 17418
Added tag 2.3.1 for changeset 072209ae4ddb
Matt Mackall <mpm@selenic.com> [Sat, 01 Sep 2012 12:48:08 -0500] rev 17417
merge with crew
Martin Schröder <martin.schroeder@nerdluecht.de> [Sat, 01 Sep 2012 14:31:31 +0200] rev 17416
i18n-de: synchronized with 20665910d9d9; fix Bug 3082
Wagner Bruna <wbruna@yahoo.com> [Fri, 31 Aug 2012 21:49:52 -0300] rev 17415
i18n-pt_BR: synchronized with bdd248666dbc
Wagner Bruna <wbruna@yahoo.com> [Fri, 31 Aug 2012 21:44:58 -0300] rev 17414
merge with i18n
Patrick Mezard <patrick@mezard.eu> [Fri, 03 Aug 2012 21:37:33 +0200] rev 17413
convert: use subprocess for all commandline calls
Avoid mixing popen and subprocess calls, it simplifies the command line
generation and quoting issues with redirections.
In practice, it fixes the subversion sink on Windows and probably helps
with monotone and darcs sources.
Patrick Mezard <patrick@mezard.eu> [Fri, 03 Aug 2012 21:05:01 +0200] rev 17412
convert: make commandline.limit_arglist private, simplify
Matt Harbison <matt_harbison@yahoo.com> [Tue, 14 Aug 2012 22:38:25 -0400] rev 17411
largefiles: adjust localstore to handle batch statlfile requests (issue3583)
This fixes a traceback when pushing to a local repo which started with
9e1616307c4c.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 31 Aug 2012 23:27:26 +0200] rev 17410
strip: fix revset usage (issue3604)
The `repair` code builds a giant revset query instead of using the "%lr" idiom.
It is inefficient and crash when the number of stripped changeset is too big.
This changeset replaces the bad code by a better revset usage.
Matt Mackall <mpm@selenic.com> [Fri, 31 Aug 2012 20:40:13 -0500] rev 17409
merge with i18n
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 27 Aug 2012 23:33:38 +0900] rev 17408
i18n-ja: synchronized with 9d9d15928521
Leah Xue <leahxue@fb.com> [Tue, 21 Aug 2012 16:06:34 -0700] rev 17407
histedit: factored out diff/patch logic
This patch is the first step towards a refactoring of the histedit
extension to use underlying graft machinery instead of diff/patch as
discussed in issue3527. Replacing diff/patch with graft is necessary
to fix, for example, issue3582.
Matt Mackall <mpm@selenic.com> [Tue, 28 Aug 2012 17:59:08 -0500] rev 17406
merge with stable
Steve Borho <steve@borho.org> [Tue, 28 Aug 2012 11:15:34 -0500] rev 17405
obsolete: import modules within mercurial/ without "from mercurial"
Adrian Buehlmann <adrian@cadifra.com> [Tue, 28 Aug 2012 20:57:11 +0200] rev 17404
test-hybridencode: add cases for com0..9 and lpt0..9
note that com0 and lpt0 are *not* encoded
Nikolaj Sjujskij <sterkrig@myopera.com> [Thu, 16 Aug 2012 19:04:27 +0400] rev 17403
zsh completion: tweak options for `incoming`, `outgoing` and `rebase`
* `incoming --rev` completes _hg_labels, not jsut tags;
* `outgoing --rev` completes revrange;
* source/dest/base for `rebase` require argument.
Nikolaj Sjujskij <sterkrig@myopera.com> [Thu, 16 Aug 2012 19:03:01 +0400] rev 17402
zsh completion: update mq commands completion
* add qclone command;
* qapplied/qunapplied: add --last/--first;
* qdiff: add all diff options;
* qfold: add --force, --no-backup;
* qgoto: add --keep-changes;
* qimport: add --git, --push;
* qnew: add user- and date-related options;
* qpop/qpush: add --keep-changes and --no-backup, drop --name;
* qpush: drop deprecated --merge;
* qrename: complete only unapplied patches' names;
* strip: add --rev, --keep, --bookmark, update descriptions, drop --backup.
Nikolaj Sjujskij <sterkrig@myopera.com> [Thu, 16 Aug 2012 19:03:01 +0400] rev 17401
zsh completion: add new options for existing commands
* backout: add --tool;
* bisect: add --extend;
* bookmarks: add --inactive;
* branches: add --closed;
* bundle: add --rev, --all, --branch;
* cat: add --decode;
* clone: add --updaterev, --branch, --pull and use common-with-qclone opts;
* commit: add --close-branch;
* diff: add --change, --reverse, --stat, --text, --unified;
* export: add --rev;
* grep: add --date;
* heads: add --topo, --closed;
* help: add --extension, --command, --keywords; complete additional help
topics also, not commands only;
* identify: add --bookmark and remote_opts;
* import: add --no-commit, --exact, --import-branch, --date, --user,
--similarity and commit options;
* log: add --user, --date, --stat, --git, --graph;
* manifest: add --rev;
* push: add --new-branch;
* resolve: add --all, --no-status, --tool and pattern options;
* revert: add --date;
* serve: add --prefix, --web-conf, --pid-file, --cmdserver, --certificate;
* status: add --change;
* tag: add --force, --edit, --remove;
* tip: add --git;
* update: add --check, --date.
Nikolaj Sjujskij <sterkrig@myopera.com> [Thu, 16 Aug 2012 19:03:01 +0400] rev 17400
zsh completion: add support for convert, graphlog, purge, record extensions
Nikolaj Sjujskij <sterkrig@myopera.com> [Thu, 16 Aug 2012 19:03:01 +0400] rev 17399
zsh completion: add subrepos options for all supporting commands
Nikolaj Sjujskij <sterkrig@myopera.com> [Thu, 16 Aug 2012 19:03:01 +0400] rev 17398
zsh completion: add new option groups for options
Add clone, date/user, git-style, merge tool, ignore space, log,
branch/bookmarks options and use them throughout command completions.
Nikolaj Sjujskij <sterkrig@myopera.com> [Thu, 16 Aug 2012 19:02:49 +0400] rev 17397
zsh completion: add `forget` and `rollback` commands
Nikolaj Sjujskij <sterkrig@myopera.com> [Thu, 16 Aug 2012 11:21:46 +0400] rev 17396
zsh completion: complete additional topics for `help`, not commands only
Patrick Mezard <patrick@mezard.eu> [Mon, 27 Aug 2012 21:10:11 +0200] rev 17395
Merge with stable
John Li <jli@circularly.org> [Mon, 27 Aug 2012 09:57:58 -0400] rev 17394
tests: merging bookmarked heads
45b5eb2941d0 fixed an error that occured when heads being merged were both
inactive bookmarks. Add a test for that case.
Matt Mackall <mpm@selenic.com> [Fri, 24 Aug 2012 17:51:47 -0500] rev 17393
merge with stable
Adrian Buehlmann <adrian@cadifra.com> [Mon, 06 Aug 2012 12:59:47 +0200] rev 17392
debuginstall: show directory for Python lib
Example new output
on Windows:
$ hg debuginstall
checking encoding (cp1252)...
checking Python lib (C:\Users\adi\hgrepos\hg-main\hg-python\lib)...
checking installed modules (C:\Users\adi\hgrepos\hg-main\mercurial)...
checking templates (C:\Users\adi\hgrepos\hg-main\mercurial\templates)...
checking commit editor...
C:\Program Files (x86)\Notepad++\notepad++.exe
checking username...
no problems detected
on Linux:
adi@kork-ubuntu64:~/hgrepos/hg-main$ ./hg debuginstall
checking encoding (UTF-8)...
checking Python lib (/usr/lib/python2.7)...
checking installed modules (/home/adi/hgrepos/hg-main/mercurial)...
checking templates (/home/adi/hgrepos/hg-main/mercurial/templates)...
checking commit editor...
checking username...
no problems detected
Ross Lagerwall <rosslagerwall@gmail.com> [Sat, 04 Aug 2012 07:14:40 +0200] rev 17391
util: replace util.nulldev with os.devnull
Python since 2.4 has supported os.devnull so having util.nulldev
is unnecessary.
Patrick Mezard <patrick@mezard.eu> [Sat, 04 Aug 2012 20:20:48 +0200] rev 17390
revset: add hidden() revset
Steve Borho <steve@borho.org> [Thu, 23 Aug 2012 18:19:19 -0500] rev 17389
wix: bump MSI based installers to use Python 2.7
We're somewhat forced to use Python 2.7 for the bdist packages, so we might
as well use 2.7 for the MSI installers as well.
Matt Mackall <mpm@selenic.com> [Fri, 24 Aug 2012 14:53:07 -0500] rev 17388
merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 24 Aug 2012 14:52:45 -0500] rev 17387
tests: fix template test output
John Li <jli@circularly.org> [Wed, 22 Aug 2012 11:18:35 -0400] rev 17386
merge: handle case when heads are all bookmarks
If all heads are bookmarks, merge fails to find what node to merge
with (throws an IndexError while indexing into the non-bookmark heads
list) as of 4a02cf4fbb2e. This catches that case and prints an error
to specify a rev explicitly.
Patrick Mezard <patrick@mezard.eu> [Tue, 21 Aug 2012 20:51:16 +0200] rev 17385
verify: do not choke on valid changelog without manifest
Before this change:
$ hg init
$ hg branch foo
$ hg ci -m branchfoo
$ hg verify
checking changesets
checking manifests
0: empty or missing manifest
crosschecking files in changesets and manifests
checking files
0 files, 1 changesets, 0 total revisions
1 integrity errors encountered!
(first damaged changeset appears to be 0)
[1]
Bryan O'Sullivan <bryano@fb.com> [Tue, 21 Aug 2012 13:12:56 -0700] rev 17384
Merge
Neil Kodner <neilk@fb.com> [Fri, 17 Aug 2012 15:12:01 -0700] rev 17383
templater: abort when a template filter raises an exception (issue2987)
Matt Mackall <mpm@selenic.com> [Tue, 21 Aug 2012 12:27:57 -0500] rev 17382
merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 21 Aug 2012 12:27:47 -0500] rev 17381
merge with i18n
Alexander Sauta <demosito@gmail.com> [Mon, 13 Aug 2012 16:09:35 +0400] rev 17380
i18n-ru: synchronized with c6f88e7f95b7
Matt Mackall <mpm@selenic.com> [Tue, 21 Aug 2012 12:26:53 -0500] rev 17379
merge heads in stable
Matt Mackall <mpm@selenic.com> [Fri, 17 Aug 2012 14:37:59 -0500] rev 17378
commit: normalize filenames when checking explicit files (issue3576)
Patrick Mezard <patrick@mezard.eu> [Sat, 18 Aug 2012 16:35:36 +0200] rev 17377
test-status.t: test ui.slash on Windows
Adrian Buehlmann <adrian@cadifra.com> [Thu, 16 Aug 2012 13:57:43 +0200] rev 17376
manifest: remove redundant sorted() call for --all
repo.store.datafiles() is now already sorted (for all types of stores).
A follow-up to 4cbb1137941d.
Bryan O'Sullivan <bryano@fb.com> [Wed, 15 Aug 2012 16:33:26 -0700] rev 17375
Merge from crew-stable
Bryan O'Sullivan <bryano@fb.com> [Wed, 15 Aug 2012 16:31:25 -0700] rev 17374
store: only one kind of OSError means "nonexistent entry"
Bryan O'Sullivan <bryano@fb.com> [Wed, 15 Aug 2012 16:30:32 -0700] rev 17373
store: sort the results of fncachestore.datafiles()
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 23:03:40 +0200] rev 17372
Merge with stable
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 22:50:23 +0200] rev 17371
fileset: fix generator vs list bug in fast path
$ hg debugfileset 'a or b'
would only return a or b but not both because the base file list was a
generator instead of a replayable sequence.
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 22:28:32 +0200] rev 17370
debugfileset: implement --rev, more tests
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 22:09:09 +0200] rev 17369
test-fileset: test remaining predicates
- exec
- symlink
- size
- resolved / unresolved
- subrepo
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 19:25:45 +0200] rev 17368
fileset: do not traceback on invalid grep pattern
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 22:29:32 +0200] rev 17367
fileset: matchctx.existing() must consider ignored files
When running:
$ hg debugfileset 'binary() and ignored()'
getfileset() was correctly retrieving ignored files but
matchctx.existing() was not taking them in account. Just add them along
with unknown files.
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 22:29:09 +0200] rev 17366
fileset: matchctx.existing() must consider unknown files
By default, unknown files are ignored. If the 'unknown()' predicate
appears in the syntax tree, then they are taken in account.
Unfortunately, matchctx.existing() was filtering against non-deleted
context files, which does not include unknown files. So:
$ hg debugfileset 'binary() and unknown()'
would not return existing binary unknown files.
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 21:44:00 +0200] rev 17365
fileset: exclude deleted files from matchctx.existing()
Running:
$ hg debugfileset 'binary()'
would traceback if there were one deleted file in the working directory.
It happened because matchctx.existing() was filtering files against the
ctx.__contains__() but deleted files are still considered part of
workingctx.
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 18:04:50 +0200] rev 17364
test-fileset: test file status predicates
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 19:02:04 +0200] rev 17363
fileset: actually implement 'minusset'
$ hg debugfileset 'a* - a1'
was tracing back because 'minus' symbol was not supported.
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 17:39:03 +0200] rev 17362
tests: test filesets with test-fileset.t
Sune Foldager <cryo@cyanite.org> [Wed, 15 Aug 2012 12:12:21 +0200] rev 17361
merge with stable
Sune Foldager <cryo@cyanite.org> [Wed, 15 Aug 2012 12:04:50 +0200] rev 17360
rollback: write dirstate branch with correct encoding
Bryan O'Sullivan <bryano@fb.com> [Tue, 14 Aug 2012 08:12:09 -0700] rev 17359
Merge
Bryan O'Sullivan <bryano@fb.com> [Tue, 14 Aug 2012 08:11:15 -0700] rev 17358
templatekw: merge, preferring the second implementation
epriestley <hg@yghe.net> [Tue, 10 Jul 2012 08:43:32 -0700] rev 17357
templatekw: add p1rev, p1node, p2rev, p2node keywords
The {parents} template is cumbersome for some uses, as it does not show
anything if there's only one "natural" parent and you can't use it to get the
full 40 digit node hashes for parents unless you rely on the behavior of
the --debug flag.
Introduce four new template keywords: {p1rev}, {p2rev}, {p1node} and
{p2node}. The "node" flavors of these always show full 40 digit hashes,
but users can get the short version with a filter construction like
'{p1node|short}'.