Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:53:49 -0500] rev 14680
fileset: add hgignore
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:53:49 -0500] rev 14679
fileset: add resolved and unresolved predicates
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:53:49 -0500] rev 14678
fileset: prescan parse tree to optimize status usage
We only call status if needed to avoid walking the working directory
or comparing manifests.
Similarly, we scan for whether unknown or ignored files are mentioned
so we can include them.
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:53:49 -0500] rev 14677
fileset: add support for file status predicates
This forcibly walks the tree looking for unknown and ignored files,
which is suboptimal. A better approach would scan the tree first to
find required status components and skip the status check entirely if
it's unused.
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:53:49 -0500] rev 14676
fileset: add some basic predicates
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:53:44 -0500] rev 14675
match: introduce basic fileset support
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:52:51 -0500] rev 14674
match: allow passing a context object to match core
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:52:51 -0500] rev 14673
fileset: drop matchfn
This is now built into contexts
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:52:51 -0500] rev 14672
scmutil: match no longer accepts repo objects
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:52:51 -0500] rev 14671
scmutil: switch match users to supplying contexts
The most appropriate context is not always clearly defined. The obvious cases:
For working directory commands, we use None
For commands (eg annotate) with single revs, we use that revision
The less obvious cases:
For commands (eg status, diff) with a pair of revs, we use the second revision
For commands that take a range (like log), we use None
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:52:51 -0500] rev 14670
scmutil: match now accepts a context or a repo
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:52:51 -0500] rev 14669
context: add a match builder method
This is groundwork for matching against filesets in contexts
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 17 Jun 2011 18:24:54 -0300] rev 14668
help/hgignore: refer to the builtin help instead of external URLs
Mads Kiilerich <mads@kiilerich.com> [Sat, 18 Jun 2011 01:08:54 +0200] rev 14667
sslutil: make messages for Python without certificate handling more helpful
We now explain why there is no certificate to verify and do not give hints
about cacerts when they can't be used anyway.
Nicolas Bareil <nico@chdir.org> [Sat, 18 Jun 2011 01:03:03 +0200] rev 14666
sslutil: fall back to commonName when no dNSName in subjectAltName (issue2798)
Any entries in subjectAltName would prevent fallback to using commonName, but
RFC 2818 says:
If a subjectAltName extension of type dNSName is present, that MUST
be used as the identity. Otherwise, the (most specific) Common Name
field in the Subject field of the certificate MUST be used.
We now only consider dNSNames in subjectAltName.
(dNSName is known as 'DNS' in OpenSSL/Python.)
Matt Mackall <mpm@selenic.com> [Fri, 17 Jun 2011 15:43:50 -0500] rev 14665
merge with i18n
Augie Fackler <durin42@gmail.com> [Fri, 17 Jun 2011 15:22:50 -0500] rev 14664
svn subrepos: work around checkout obstructions (issue2752)
We do this by ensuring the working copy is clean and then blowing away
the working copy and replacing it with one from the desired path. We
could probably use 'svn switch' to do this more efficiently, but
there's some subtle logic required to get that right and this is
more likely to work reliably.
Augie Fackler <durin42@gmail.com> [Fri, 17 Jun 2011 15:21:02 -0500] rev 14663
update: check wc.dirty() before setting overwrite=True
merge.update() was missing a few dirtiness checks from workingcontext,
including subrepo cleanliness checks. Using wc.dirty() instead of
one-off checks for various forms of dirtiness will be significantly
safer.
Steve Borho <steve@borho.org> [Thu, 16 Jun 2011 15:26:17 -0500] rev 14662
tags: don't allow environment errors to be raised from _writetagscache
See https://bitbucket.org/tortoisehg/thg/issue/719
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 17 Jun 2011 13:31:23 -0300] rev 14661
help/config: replace docutils markup
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 17 Jun 2011 12:23:12 -0300] rev 14660
test-i18n, i18n-pt_BR: update test message
This changes both a test and a translation, so I'm sending
a patch; please let me know if I should push this directly
to i18n instead.
Matt Mackall <mpm@selenic.com> [Fri, 17 Jun 2011 15:36:56 -0500] rev 14659
config: undo change of empty line definition
We don't allow spaces in front of comment markers
Patrick Mezard <pmezard@gmail.com> [Fri, 17 Jun 2011 20:33:02 +0200] rev 14658
patch: make filestore store data in memory and fallback to fs
Martin Geisler <mg@aragost.com> [Wed, 15 Jun 2011 10:40:23 +0200] rev 14657
i18n: merge in latest Romanian translations
Daniel Dumitriu <daniel.dumitriu@gmail.com> [Wed, 08 Jun 2011 17:06:29 +0200] rev 14656
i18n-ro: synchronized with 3c7907dc95ca
Daniel Dumitriu <daniel.dumitriu@gmail.com> [Wed, 08 Jun 2011 15:17:23 +0200] rev 14655
i18n-ro: outstanding changes
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 16 Jun 2011 12:52:37 -0300] rev 14654
help/config: quote config section names consistently
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 16 Jun 2011 12:42:19 -0300] rev 14653
help/config: fix small typo
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 16 Jun 2011 12:30:57 -0300] rev 14652
help/config: do not refer to config files as hgrc files
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 16 Jun 2011 12:30:44 -0300] rev 14651
help/config: fix 'Mercurial' casing
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 16 Jun 2011 22:47:34 +0200] rev 14650
revset: add desc(string) to search in commit messages
Like keyword(), but does not search in filenames and users.
No grepdesc() or descgrep() added, because it might be bad to introduce
grepfoo() versions of too many string searches.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 16 Jun 2011 22:03:26 +0200] rev 14649
revset: update sorting of symbols
Matt Mackall <mpm@selenic.com> [Thu, 16 Jun 2011 14:33:06 -0500] rev 14648
http: fix variable name in unexpected response message
Idan Kamara <idankk86@gmail.com> [Fri, 03 Jun 2011 17:27:41 +0300] rev 14647
serve: add --cmdserver option to communicate with hg over a pipe
Idan Kamara <idankk86@gmail.com> [Wed, 15 Jun 2011 23:15:04 +0300] rev 14646
localrepo: don't attempt to open .hgtags twice if the error isn't ENOENT
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 16 Jun 2011 01:58:00 +0200] rev 14645
log: do not display hidden changeset
We add a --hidden option to display them.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 16 Jun 2011 01:57:59 +0200] rev 14644
hidden: Add ``hidden`` method for context
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 16 Jun 2011 01:57:53 +0200] rev 14643
hidden: Add a hiddenrevs attributes to changelog.
This attributes hold the set of all revisions that should be ommited by command
and tools displaying changesets.
This set is given as a hit. Command and tools are responsible to check it in
order to filter they outpur.
Code adding revisions to the set are responsible to the consistency of it's
data.
Matt Mackall <mpm@selenic.com> [Thu, 16 Jun 2011 13:24:44 -0500] rev 14642
config: handle comment lines in continuations (issue2854)
Matt Mackall <mpm@selenic.com> [Thu, 16 Jun 2011 13:24:42 -0500] rev 14641
http: report unexpected unparsable push responses (issue2777)
Idan Kamara <idankk86@gmail.com> [Tue, 07 Jun 2011 13:39:09 +0300] rev 14640
dispatch: write shell alias output to ui out descriptor
Idan Kamara <idankk86@gmail.com> [Wed, 08 Jun 2011 14:54:52 +0300] rev 14639
commands: use ui descriptors when reading/writing from stdin/out
Idan Kamara <idankk86@gmail.com> [Wed, 15 Jun 2011 23:50:33 +0300] rev 14638
cmdutil: return a dummy, closable file object if it cannot be duped
If the ui I/O descriptors aren't real descriptors, they cannot be duped.
Instead, we return a wrapper object that behaves the same, and
can be closed (by overriding close and doing nothing).
Idan Kamara <idankk86@gmail.com> [Wed, 08 Jun 2011 14:54:52 +0300] rev 14637
cmdutil: use ui descriptors in makefileobj
Idan Kamara <idankk86@gmail.com> [Wed, 08 Jun 2011 14:54:52 +0300] rev 14636
mq: use ui.fin when importing patch from '-'
Idan Kamara <idankk86@gmail.com> [Wed, 08 Jun 2011 14:54:52 +0300] rev 14635
cmdutil, logmessage: use ui.fin when reading from '-'
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 15 Jun 2011 17:04:06 -0300] rev 14634
dagutil: fix missing import of i18n._
Satish Balay <balay@fastmail.fm> [Thu, 16 Jun 2011 19:34:42 +0200] rev 14633
hgmanpage: adapt to Docutils 0.8 API change
Martin Geisler <mg@aragost.com> [Thu, 16 Jun 2011 08:49:26 +0200] rev 14632
manifest: use "\0" instead of "\000"
Though both give the same result (a NUL byte), I found that I tend to
read "\000" as "\0" + "00", which is something completely different.
I did not change the occurance of "\000" in archival.py since there
are other octal constants in that file.
Martin Geisler <mg@aragost.com> [Wed, 15 Jun 2011 17:25:58 +0200] rev 14631
commands: add pointer to bookmarks command in branch help
Martin Geisler <mg@aragost.com> [Wed, 15 Jun 2011 17:10:26 +0200] rev 14630
glossary: add entry for "Bookmark"
Martin Geisler <mg@aragost.com> [Wed, 15 Jun 2011 17:10:16 +0200] rev 14629
glossary: add entry for "Tag"
Matt Mackall <mpm@selenic.com> [Tue, 14 Jun 2011 20:43:04 -0500] rev 14628
merge with i18n
Alexander Sauta <demosito@gmail.com> [Tue, 14 Jun 2011 00:31:56 +0400] rev 14627
i18n-ru: translated all standard commands and config-environment additional help topics
Alexander Sauta <demosito@gmail.com> [Fri, 10 Jun 2011 01:39:22 +0400] rev 14626
i18n-ru: translated push-rename
Alexander Sauta <demosito@gmail.com> [Thu, 09 Jun 2011 20:37:32 +0400] rev 14625
i18n-ru: translated parents-pull
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 14 Jun 2011 22:58:00 +0200] rev 14624
setdiscovery: batch heads and known(ownheads)
This means that we now discover both subset conditions (local<remote and
remote<local) in a single roundtrip without ever constructing an actual
sample (which takes a bit of client CPU).
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 14 Jun 2011 22:56:20 +0200] rev 14623
wireproto: make a number of commands batchable
Makes lookup, heads, known, branchmap, pushkey, and listkeys batchable.
It could, for instance, be interesting to use this to batch calls to
lookup when a pull or clone has multiple --rev arguments. The next patch
is going to batch heads and known to slightly tune discovery.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 14 Jun 2011 22:52:58 +0200] rev 14622
wireproto: add batching support to wirerepository
Adds the plumbing and wire call for batched execution, but does not
batch-enable any methods yet.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 14 Jun 2011 22:51:26 +0200] rev 14621
wireproto: add basic command batching infrastructure
Note that localbatch will not be used until we actually have a localpeer to
use it with.
Yuya Nishihara <yuya@tcha.org> [Wed, 15 Jun 2011 01:50:49 +0900] rev 14620
mq: make qrefresh/qfold keep wlock until saving patch status
Because q.refresh() changes nodeid, .hg/patches/status gets invalid until
q.savedirty(). This patch changes mq not to unlock repository of incomplete
state.
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 14 Jun 2011 20:08:35 -0300] rev 14619
bugzilla: fix typo in documentation
Idan Kamara <idankk86@gmail.com> [Tue, 14 Jun 2011 20:25:38 +0300] rev 14618
dispatch: fix for-loop variable name
Ingo Bressler <dev@ingobressler.net> [Tue, 14 Jun 2011 13:29:25 +0200] rev 14617
notify: send changesets on 'outgoing' hook, updated doc
Stephen Thorne <stephen@thorne.id.au> [Tue, 14 Jun 2011 13:31:32 +1000] rev 14616
sslutil: Restore missing imports of socket and httplib to sslutil
Two imports were omitted in the restructure of the code creating
sslutil.py, socket and httplib are required when the 'ssl' module
cannot be imported, restoring these imports allows mercurial to run
on python2.4+2.5.
Idan Kamara <idankk86@gmail.com> [Wed, 08 Jun 2011 14:54:47 +0300] rev 14615
dispatch: assign I/O descriptors from the request to the ui
Idan Kamara <idankk86@gmail.com> [Wed, 08 Jun 2011 01:39:20 +0300] rev 14614
ui: use I/O descriptors internally
and as a result:
- fix webproto to redirect the ui descriptors instead of sys.stdout/err
- fix sshserver to use the ui descriptors
Idan Kamara <idankk86@gmail.com> [Tue, 07 Jun 2011 13:39:09 +0300] rev 14613
dispatch: add I/O descriptors to the request
Idan Kamara <idankk86@gmail.com> [Tue, 07 Jun 2011 13:39:09 +0300] rev 14612
ui: add I/O descriptors
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Jun 2011 23:26:35 +0200] rev 14611
import: add --bypass option
This feature is more a way to test patching without a working directory than
something people asked about. Adding a --rev option to specify the parent patch
revision would make it a little more useful.
What this change introduces is patch.repobackend class which let patches be
applied against repository revisions. The caller must supply a filestore object
to receive patched content, which can be turned into a memctx with
patch.makememctx() helper.
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Jun 2011 23:24:40 +0200] rev 14610
import: separate parents selection from working dir update
This will be useful when patching without updating the dirstate
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Jun 2011 23:24:34 +0200] rev 14609
patch: extend filtestore to store an optional copy source
This will help wrapping filestores in memctx.
Martin Geisler <mg@aragost.com> [Tue, 14 Jun 2011 16:38:34 +0200] rev 14608
paper/coal: use fixed width for diffstat +/- link
The plus and minus characters are normally not the same width in a
non-monospace font, and this made the line length change when the
diffstat display was toggled.
The square brackets are not rendered in a monospace font to ensure
that they align with the parenthesis on the same line.
Martin Geisler <mg@aragost.com> [Tue, 14 Jun 2011 16:33:46 +0200] rev 14607
hg: rename opts argument to peeropts in clone
This should make it clearer that the options are used with remoteui
only and are not used otherwise in hg.clone.
Matt Mackall <mpm@selenic.com> [Mon, 13 Jun 2011 16:25:18 -0500] rev 14606
hg: move peerschemes back to schemes
This will avoid breaking things with extensions until peers are fully
separated from repos.
Matt Mackall <mpm@selenic.com> [Mon, 13 Jun 2011 14:53:23 -0500] rev 14605
hg: rearrange peer scheme lookup
There is now only peer scheme lookup. Repository lookup goes through
peer scheme lookup. When peer and repo types are finally separated,
repo lookup will use peer.local() to get a repository object.
The underbar is dropped so that extensions can patch the table.
Idan Kamara <idankk86@gmail.com> [Mon, 13 Jun 2011 14:56:00 +0300] rev 14604
forget, remove: don't note on nonexistent file twice
before:
$ hg forget foo
foo: No such file or directory
not removing foo: file is already untracked
after:
$ hg forget foo
foo: No such file or directory
Matt Mackall <mpm@selenic.com> [Mon, 13 Jun 2011 12:51:38 -0500] rev 14603
localrepo: local() returns self
Temporary measure for introducing peers
Matt Mackall <mpm@selenic.com> [Mon, 13 Jun 2011 12:51:37 -0500] rev 14602
tests: avoid instability in test-convert-cvs-synthetic
Idan Kamara <idankk86@gmail.com> [Mon, 13 Jun 2011 00:19:26 +0300] rev 14601
dispatch: propagate ui command options to the local ui (issue2523)
so the ui object passed to pre/post python hooks has the verbose flag
(and the rest) set correctly
Idan Kamara <idankk86@gmail.com> [Sun, 12 Jun 2011 23:30:39 +0300] rev 14600
mq: catch correct exception when calling changelog.rev()
Idan Kamara <idankk86@gmail.com> [Sun, 12 Jun 2011 17:26:58 +0300] rev 14599
rebase: preserve mq series order after rebasing (issue2849)
Idan Kamara <idankk86@gmail.com> [Sun, 12 Jun 2011 17:26:20 +0300] rev 14598
run-tests: verbose log ignored test
Ingo Proetel <proetel@aicas.de> [Fri, 10 Jun 2011 10:58:10 +0200] rev 14597
record: add white space diff options
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 13:53:58 +0200] rev 14596
mq: rename abort_if_wdir_patched to abortifwdirpatched
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 13:48:47 +0200] rev 14595
mq: rename partial_name to partialname
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 13:47:21 +0200] rev 14594
mq: rename write_list to writelist
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 13:45:48 +0200] rev 14593
mq: rename series_dirty to seriesdirty
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 13:44:34 +0200] rev 14592
mq: rename applied_dirty to applieddirty
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 13:43:03 +0200] rev 14591
mq: rename guards_dirty to guardsdirty
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 13:41:58 +0200] rev 14590
mq: rename active_guards to activeguards
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 13:40:35 +0200] rev 14589
mq: rename guards_path to guardspath
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 13:39:14 +0200] rev 14588
mq: rename status_path to statuspath
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 13:38:04 +0200] rev 14587
mq: rename series_path to seriespath
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 12:11:49 +0200] rev 14586
mq: rename series_end to seriesend
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 12:09:29 +0200] rev 14585
mq: rename full_series_end to fullseriesend
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 12:07:46 +0200] rev 14584
mq: rename check_reserved_name to checkreservedname
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 12:06:32 +0200] rev 14583
mq: rename check_localchanges to checklocalchanges
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 12:05:20 +0200] rev 14582
mq: rename check_substate to checksubstate
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 12:03:38 +0200] rev 14581
mq: rename check_toppatch to checktoppatch
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 12:02:14 +0200] rev 14580
mq: rename save_dirty to savedirty
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 12:00:56 +0200] rev 14579
mq: rename explain_pushable to explainpushable
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 11:59:35 +0200] rev 14578
mq: rename set_active to setactive
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 11:58:16 +0200] rev 14577
mq: rename set_guards to setguards
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 11:57:21 +0200] rev 14576
mq: rename check_guard to checkguard
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 11:55:46 +0200] rev 14575
mq: rename parse_series to parseseries
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 11:54:25 +0200] rev 14574
mq: rename find_series to findseries
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 11:40:27 +0200] rev 14573
mq: rename series_guards to seriesguards
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 11:06:11 +0200] rev 14572
mq: rename full_series to fullseries
Steven Brown <StevenGBrown@gmail.com> [Sat, 11 Jun 2011 21:24:50 +0800] rev 14571
paper, coal: display diffstat on the changeset page
Displayed in a row of the changeset summary table, underneath the list of
files. When the page is loaded, only the diff summary is displayed. The full
diffstat is only displayed when the [+] link is selected.
Steven Brown <StevenGBrown@gmail.com> [Sat, 11 Jun 2011 21:11:43 +0800] rev 14570
web: provide diff summary to the changeset page
This is the same message displayed at the end of the "diff --stat" command.
For example, "9 files changed, 1651 insertions(+), 2 deletions(-)".
The webutil.diffstatgen function allows the diffstat data to be lazily
calculated only once and then re-used.
Matt Mackall <mpm@selenic.com> [Sat, 11 Jun 2011 14:14:53 -0500] rev 14569
tests: fix up date ambiguity in cvs test
Matt Mackall <mpm@selenic.com> [Sat, 11 Jun 2011 14:14:52 -0500] rev 14568
hg: split peer and repo lookup tables
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Jun 2011 14:40:25 +0200] rev 14567
tests: rename test-git-import.t into test-import-git.t
This is consistent with other test-import* tests.
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Jun 2011 14:17:25 +0200] rev 14566
patch: generalize the use of patchmeta in applydiff()
- Add patchmeta.copy() and emit copies from iterhunks. Modifying patchmeta
instances in applydiff() makes things simpler.
- Rename selectfile() into makepatchmeta(). It is responsible for creating
patchmeta for regular patches.
- Pass patchmeta objects to patchfile() directly
patchmeta instances were associated with git patches, for regular patches we
had to pass additional variables to tell the patch intent to patchfile().
Instead, we generate patchmeta for regular patches and pass them. This will
also help with patch filtering by matcher objects.
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Jun 2011 14:14:13 +0200] rev 14565
patch: stop updating changed files set in applydiff()
This information is more correctly returned by backends.
The extra updated file removed from test-mq-merge.t output came from changes
from git patches being counted before being really applied in some cases.
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Jun 2011 14:14:11 +0200] rev 14564
patch: turn patch() touched files dict into a set
Steven Brown <StevenGBrown@gmail.com> [Thu, 09 Jun 2011 01:19:39 +0800] rev 14563
paper, coal: define the diffstat templates
The templates output the filename, the total number of changes to the file
and a bar graph of the adds and removes. The filename is a link into the diff
output.
The diffstat is not yet displayed, but it can be manually added to the
changeset page template.
Steven Brown <StevenGBrown@gmail.com> [Thu, 09 Jun 2011 01:15:49 +0800] rev 14562
web: provide the file number to the diffstat templates
This allows the diffstat templates to link into the diff output. For example,
the URLs of the first three files within the diff are #l1.1, #l2.1, #l3.1.
Steven Brown <StevenGBrown@gmail.com> [Thu, 09 Jun 2011 01:14:22 +0800] rev 14561
web: include all files in the diffstat
The webutil.diffstat function now returns a diffstat template for each file
in the diff. It previously returned a template for each file returned by
ctx.files() which did not work well for merge changesets.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 10 Jun 2011 20:38:02 +0200] rev 14560
hgignore: ignore MANIFEST.in (generated since 2ce7dfe17bc5)
LUO Zheng <xmuluo@gmail.com> [Wed, 08 Jun 2011 21:25:18 +0800] rev 14559
bookmarks: recognize the current bookmark when the local encoding isn't UTF-8
The current bookmark is stored in bookmark.current, supposingly in UTF-8.
But the call to encoding.fromlocal() is missing, therefore Hg is not able
to recognize the current bookmark in the case that bookmark uses
characters of which the bit stream is different between local encoding
and UTF-8.
For example, the Chinese version of Windows cmd uses gbk(cp936), not UTF-8.
Therefore I won't be able to make a Chinese bookmark current.
By wrapping mark in a encoding.fromlocal() call, the problem is solved.
Stephen Thorne <stephen@thorne.id.au> [Thu, 09 Jun 2011 10:15:24 +1000] rev 14558
distutils: Create MANIFEST.in instead of MANIFEST in Makefile
When running 'python setup.py sdist' many files were omitted from the resulting
tarball that are required for a complete build, including the .h file for the
inotify extension due to a python2.7+ distutils bug. This would cause 'make dist'
to fail to build a correct dist on python2.7
By building a MANIFEST.in that is the same as the old MANIFEST with 'include'
at the start of each line will cause a correct MANIFEST to be built and used
by distutils.
Adrian Buehlmann <adrian@cadifra.com> [Thu, 09 Jun 2011 18:39:14 +0200] rev 14557
revert: is reverting file states, not just file contents
e.g. x bit is reverted as well
Also makes this paragraph more consistent with the preceding one,
which already uses the term "state" (not "content").
Matt Mackall <mpm@selenic.com> [Fri, 10 Jun 2011 11:43:38 -0500] rev 14556
hg: change various repository() users to use peer() where appropriate
This gets all the easy cases (peers that aren't also used as repositories).
Matt Mackall <mpm@selenic.com> [Fri, 10 Jun 2011 11:43:38 -0500] rev 14555
hg: have peer() call _lookup directly
Note that this means that peers no longer call the extension
repository setup hooks.
Matt Mackall <mpm@selenic.com> [Fri, 10 Jun 2011 11:43:38 -0500] rev 14554
hg: add peer method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 08 Jun 2011 18:24:33 +0200] rev 14553
hg: add opts argument to clone for internal remoteui
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 06 Jun 2011 21:18:35 +0200] rev 14552
hg: use capable instead of capabilities
Matt Mackall <mpm@selenic.com> [Wed, 08 Jun 2011 13:44:41 -0500] rev 14551
fileset: basic pattern and boolean support
debugfileset can now generate file lists for things like:
"* and not hg*"
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 10 Jun 2011 16:50:45 +0200] rev 14550
tests: fix updated monotone version requirement
0969d91fad5c only updated the comment, not the actual check.
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 17:02:54 -0500] rev 14549
check-code: catch misspellings of descendant
This word is fairly common in Mercurial, and easy to misspell.
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 16:02:51 -0500] rev 14548
revert: drop obvious paragraph about filenames
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 16:01:38 -0500] rev 14547
revert: actually add pointer to backout
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:54:17 -0500] rev 14546
revert: replace mention of 'roll back' with pointer to 'backout'
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:51:18 -0500] rev 14545
revert: simplify description of effect of -r
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:49:04 -0500] rev 14544
revert: rearrange the date help
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:47:54 -0500] rev 14543
revert: remove some redundancy in basic description
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:19:05 -0500] rev 14542
revert: drop requirement to use -r to revert with two parents
This reduces documentation confusion between the need to:
a) hg revert -a -r . (drop all changes from a merge)
b) hg up -C . (drop the second parent entirely)
Currently revert is one of two commands (the other being tag) that
still complains about uncommitted merges, dating from its former use
of a generic defaultrev function that aborted.
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:18:39 -0500] rev 14541
revert: simplify usage note
This points people looking for other commands to the right place with
a minimum of verbiage.
Matt Mackall <mpm@selenic.com> [Mon, 06 Jun 2011 17:38:32 -0500] rev 14540
revert: rewrite help summary
New users have a tendency to mistake 'revert' as the command to use to
check out old revisions. They also occasionally mistake revert for a
generalized undo (compare rollback).
This version intentionally aims to avoid mentioning 'earlier' and thus
intentionally no longer alludes to the (secondary) -r behavior (which
in fact is not actually limited to 'earlier').
Instead, we mention checkout state, to convey that we can
restore things to the way they were when checked out.
Yuya Nishihara <yuya@tcha.org> [Sat, 04 Jun 2011 20:19:30 +0900] rev 14539
extensions: make disabled()/disabledext() load prebuilt index if available
__index__ contains a dict of {name: desc} of all extensions.
Yuya Nishihara <yuya@tcha.org> [Sat, 04 Jun 2011 20:11:10 +0900] rev 14538
setup: add command to generate index of extensions
It generates prebuilt index of all extensions, which will be used by
frozen exe when running 'hg help extensions'.
Now py2exe invokes this command automatically.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 06 Jun 2011 21:02:48 +0200] rev 14537
sshrepo: fix addchangegroup's signature
Make it mirror the usage found in localrepo.push. This should only
affect pushes to pre-unbundle ssh servers.
Matt Mackall <mpm@selenic.com> [Mon, 06 Jun 2011 15:17:40 -0500] rev 14536
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
We shouldn't try to process subrepos if .hgsub isn't present and we
should remove .hgsubstate if .hgsub is marked for removal.
Patrick Mezard <pmezard@gmail.com> [Sun, 05 Jun 2011 22:26:01 +0200] rev 14535
patch: dot not ignore hunk of files marked as 'deleted'
git 'deleted' flag was processed unconditionnally and the file removed even if
the related hunk was not matching.
Patrick Mezard <pmezard@gmail.com> [Sun, 05 Jun 2011 22:24:19 +0200] rev 14534
patch: fix patchmeta/hunk synchronization in iterhunks()
Synchronizing on bfile does not work on file removal where bfile is /dev/null.
We match items on afile or bfile instead. The incorrect code makes iterhunks()
to emit patchmeta and hunks separately in some cases. This is currently hidden
by applydiff() being too tolerant when processing patchmeta, and will be fixed
later.
Patrick Mezard <pmezard@gmail.com> [Sun, 05 Jun 2011 22:24:11 +0200] rev 14533
patch: remove unnecessary exists() call in selectfile()
Patrick Mezard <pmezard@gmail.com> [Sun, 05 Jun 2011 22:24:02 +0200] rev 14532
import: deprecate --base
This option was a convenient hack introduced in Mercurial early days which
unfortunately survived until now.
Patrick Mezard <pmezard@gmail.com> [Sun, 05 Jun 2011 13:27:06 +0200] rev 14531
patch: remove redundant islink() call
Yuya Nishihara <yuya@tcha.org> [Sat, 04 Jun 2011 20:01:01 +0900] rev 14530
extensions: update doc of enabled() and disabled() according to d5b525697ddb
Patrick Mezard <pmezard@gmail.com> [Sat, 04 Jun 2011 15:56:48 +0200] rev 14529
localrepo: add savecommitmessage() to write last-message.txt
Patrick Mezard <pmezard@gmail.com> [Sat, 04 Jun 2011 15:20:49 +0200] rev 14528
memctx: simplify constructor
Matt Mackall <mpm@selenic.com> [Fri, 03 Jun 2011 15:08:08 -0500] rev 14527
scmutil: improve path calculation for install-relative RC files (issue2841)
This code was ugly and might do the wrong thing with symlinks.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 03 Jun 2011 13:10:22 +0200] rev 14526
prepush: show details about new remote heads with --verbose
previously, this info was only shown with --debug
Note that the new remote heads are only shown if the command aborts,
that is, they are *not* shown if --force was specified.
See also change 91cb08a9e7fb.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 03 Jun 2011 12:16:17 +0200] rev 14525
prepush: print short hash of first new head in abort message
and don't mention the branch if it's the default branch.
OLD:
$ hg push ../a
pushing to ../a
searching for changes
abort: push creates new remote heads on branch 'default'!
(you should pull and merge or use push -f to force)
NEW:
$ hg push ../a
pushing to ../a
searching for changes
abort: push creates new remote head 1e108cc5548c!
(you should pull and merge or use push -f to force)
This helps to identify which local head is causing troubles.
See also change 91cb08a9e7fb.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 03 Jun 2011 11:26:43 +0200] rev 14524
prepush: eliminate 'if branch'
branch is always set anyway
No change in program behavior.
Sune Foldager <cryo@cyanite.org> [Fri, 03 Jun 2011 20:32:54 +0200] rev 14523
revlog: bail out earlier in group when we have no chunks
Sune Foldager <cryo@cyanite.org> [Fri, 03 Jun 2011 20:23:32 +0200] rev 14522
localrepo: simplify file bundling code and fix progress bug
Progress for files was off by one, and the code was rather hackish.
Sune Foldager <cryo@cyanite.org> [Fri, 03 Jun 2011 20:15:06 +0200] rev 14521
localrepo: use list comprehension instead of generators
The lists in question are iterated and kept in memory further down the code
path anyway, and this simplifies things.
Sune Foldager <cryo@cyanite.org> [Fri, 03 Jun 2011 20:12:37 +0200] rev 14520
localrepo: add total to changeset progress in bundle/push
Martin Geisler <mg@aragost.com> [Fri, 03 Jun 2011 20:08:26 +0200] rev 14519
statichttprepo: use in-place difference for shorter line
Adrian Buehlmann <adrian@cadifra.com> [Thu, 02 Jun 2011 00:33:33 +0200] rev 14518
workingctx: eliminate remove function
Inlining it into it's last remaining call place in cmdutil.copy.
Note that cmdutil.copy is called with the wlock already held, so no additional
locking is needed to call util.unlinkpath.
We do not need to wrap the util.unlinkpath call into a try block, because
at that point we already know whether abssrc exists or not -- thanks to the
preceding util.copyfile call. Adding a new local 'srcexists' in cmdutil.copy
for that purpose.
Adrian Buehlmann <adrian@cadifra.com> [Thu, 02 Jun 2011 19:43:17 +0200] rev 14517
test-copy2: add case for moving a missing file
Idan Kamara <idankk86@gmail.com> [Thu, 02 Jun 2011 00:43:34 +0300] rev 14516
color: check if ui is already a subclass of colorui before wrapping it
since it's possible to reuse the ui object (see 80c599eee3f3)
between dispatch calls, the ui might have been wrapped already.
we could probably move this test up a bit but leaving it here
allows updates to take effect by extstyles() and configstyles().
Idan Kamara <idankk86@gmail.com> [Thu, 02 Jun 2011 00:43:34 +0300] rev 14515
util: add helper function isatty(fd) to check for tty-ness
Steven Brown <StevenGBrown@gmail.com> [Thu, 02 Jun 2011 18:52:31 +0800] rev 14514
web: prevent TypeError thrown when using the diffstat templates
Remove the lambda used to wrap webutil.diffstat because:
- functions passed to the templater must accept keyword arguments
- webutil.diffstat is a generator, so already calculates the diffstat lazily
This reverts the changes made to 1d3e2349304a after it was submitted to the
mailing list but before it was queued.
Matt Mackall <mpm@selenic.com> [Thu, 02 Jun 2011 11:27:40 -0500] rev 14513
fileset: fix long line
Matt Mackall <mpm@selenic.com> [Thu, 02 Jun 2011 11:17:02 -0500] rev 14512
COPYING: refresh with current address from fsf.org
Matt Mackall <mpm@selenic.com> [Wed, 01 Jun 2011 19:12:18 -0500] rev 14511
filesets: introduce basic fileset expression parser
Idan Kamara <idankk86@gmail.com> [Thu, 02 Jun 2011 00:43:34 +0300] rev 14510
dispatch: add repo to the request
allows callers of dispatch.dispatch to pass in
an initialized repo object to be used.
-R/--repository overrides the request repo.
Matt Mackall <mpm@selenic.com> [Wed, 01 Jun 2011 16:42:50 -0500] rev 14509
merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 01 Jun 2011 16:32:48 -0500] rev 14508
Added signature for changeset 733af5d9f6b2
Matt Mackall <mpm@selenic.com> [Wed, 01 Jun 2011 16:32:44 -0500] rev 14507
Added tag 1.8.4 for changeset 733af5d9f6b2
Augie Fackler <durin42@gmail.com> [Tue, 31 May 2011 19:49:17 -0500] rev 14506
subrepo: make stdin for svn a pipe for non-interactive use (issue2759)
This certainly can't hurt, so go ahead and do it, potentially along
with --non-interactive if that flag is safe for the given subcommand.
Regis Desgroppes <regis.desgroppes@nokia.com> [Tue, 31 May 2011 16:22:04 -0500] rev 14505
subrepo: svn abort now depends on exit code (issue2833)
Matt Mackall <mpm@selenic.com> [Tue, 24 May 2011 17:16:31 -0500] rev 14504
httprepo: send URL redirection notices to stderr (issue2828)
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Mar 2011 14:47:30 +0100] rev 14503
httprepo: proper handling of invalid responses without content-type (issue2019)
This can currently be tested on http://sf.net/
Patrick Mezard <pmezard@gmail.com> [Fri, 29 Apr 2011 14:56:23 +0200] rev 14502
strip: make it clear that --force discards changes (issue310)
Matt Mackall <mpm@selenic.com> [Tue, 26 Apr 2011 10:51:19 -0500] rev 14501
tags: catch more corruption during cache parsing (issue2779)
Idan Kamara <idankk86@gmail.com> [Mon, 11 Apr 2011 21:44:22 +0300] rev 14500
localrepo: don't add deleted files to list of modified/added files (issue2761)
If a file is deleted (rm, not 'hg rm') from the working dir
an attempt to run 'hg diff -r X', with the file being present in X will
cause an abort.
We didn't check if the file has been deleted from the working dir
and later on tried to open it to compare with the one from X, causing the abort.
This fix adds that check. Consequently, no output will be returned.
Idan Kamara <idankk86@gmail.com> [Mon, 04 Apr 2011 22:51:10 +0300] rev 14499
localrepo: ignore tags to unknown nodes (issue2750)
David Soria Parra <dsp@php.net> [Mon, 14 Mar 2011 23:50:28 +0100] rev 14498
bookmarks: do not forward merged bookmark (issue1877)
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Sat, 26 Mar 2011 13:05:17 +0100] rev 14497
rebase: restore mq guards after rebasing (issue2107)
Guards on rebased mq patches were lost.
This patch restores them after the qimporting step.
Bernhard Leiner <bleiner@gmail.com> [Wed, 16 Mar 2011 23:09:14 +0100] rev 14496
revset: report a parse error if a revset is not parsed completely (issue2654)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 25 May 2011 18:48:00 +0200] rev 14495
color: fix --color=always when output is piped
Also restructures the mode determination as discussed on IRC.
I tried to simplify the code too, while keeping the original
semantics except for the case of --color=always.
Martin Geisler <mg@lazybytes.net> [Wed, 01 Jun 2011 12:38:46 +0200] rev 14494
check-code: flag 0/1 used as constant Boolean expression
Augie Fackler <durin42@gmail.com> [Tue, 31 May 2011 20:39:04 -0500] rev 14493
run-tests: allow whitelisting tests that should always run
It's desirable to run some tests all the time, for example
test-check-pyflakes.t and test-check-code-hg.py. This allows passing
--whitelist as a path to a file (flag can be specified more than once)
which contains a list of files to whitelist. Whitelisted tests are run
even if they're blacklisted or wouldn't match a --keyword test
run. For example, to do a quick test of usehttp2, one can now do
$ cat > test-whitelist <<EOF
> test-check-pyflakes.t
> test-check-code-hg.py
> EOF
$ (cd tests && ./run-tests.py --extra-config-opt 'ui.usehttp2=true'
> -k http -j 8 --whitelist test-whitelist)
and have all http-specific tests run as well as the two code linters.
Augie Fackler <durin42@gmail.com> [Tue, 31 May 2011 19:49:17 -0500] rev 14492
subrepo: make stdin for svn a pipe for non-interactive use (issue2759)
This certainly can't hurt, so go ahead and do it, potentially along
with --non-interactive if that flag is safe for the given subcommand.
Matt Mackall <mpm@selenic.com> [Tue, 31 May 2011 17:18:23 -0500] rev 14491
tests: glob version number in test-hgrc
Steven Brown <StevenGBrown@gmail.com> [Sat, 28 May 2011 14:44:45 +0800] rev 14490
web: provide diffstat to the changeset page
This includes all affected files, so it can be used for an extended view of
the files or as a replacement for the filenodelink and filenolink templates.
Matt Mackall <mpm@selenic.com> [Tue, 31 May 2011 16:24:47 -0500] rev 14489
tests: update for handling of missing hgrc includes
Regis Desgroppes <regis.desgroppes@nokia.com> [Tue, 31 May 2011 16:22:04 -0500] rev 14488
subrepo: svn abort now depends on exit code (issue2833)
desgropp <regis.desgroppes@nokia.com> [Tue, 31 May 2011 12:41:22 +0200] rev 14487
fixed issue2833: aborts nows depends on svn exit code
Matt Mackall <mpm@selenic.com> [Tue, 31 May 2011 16:00:39 -0500] rev 14486
config: ignore include errors for nonexistent files
Brendan Cully <brendan@kublai.com> [Tue, 31 May 2011 11:52:22 -0700] rev 14485
Make pull -u behave like pull && update
Previously, pull would not update if new branch heads were received,
whereas pull && update would move to the tipmost branch head.
Also change the "crosses branches" abort in merge.update from
"crosses branches (merge branches or use --check to force update)"
to
"crosses branches (merge branches or update --check to force update)"
since it can no longer assume the user is running hg update.
Matt Mackall <mpm@selenic.com> [Tue, 31 May 2011 15:55:23 -0500] rev 14484
requires: note apparent corruption
Adrian Buehlmann <adrian@cadifra.com> [Tue, 31 May 2011 19:16:25 +0200] rev 14483
readrequires: provide easier to understand error message
NEW:
$ hg id
abort: unknown repository format: requires feature 'foo' (upgrade Mercurial)!
OLD:
$ hg id
abort: requirement 'foo' not supported!
Adrian Buehlmann <adrian@cadifra.com> [Tue, 31 May 2011 19:16:18 +0200] rev 14482
introduce new function scmutil.readrequires
for reading and parsing the .hg/requires file
Matt Mackall <mpm@selenic.com> [Tue, 31 May 2011 15:28:23 -0500] rev 14481
merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 31 May 2011 15:26:02 -0500] rev 14480
merge with crew
Matt Mackall <mpm@selenic.com> [Tue, 31 May 2011 15:25:43 -0500] rev 14479
merge with i18n
Martin Geisler <mg@lazybytes.net> [Mon, 30 May 2011 12:21:53 +0200] rev 14478
merge with stable
Martin Geisler <mg@lazybytes.net> [Mon, 30 May 2011 12:21:08 +0200] rev 14477
merge with hg-i18n
Martin Geisler <mg@lazybytes.net> [Mon, 30 May 2011 12:20:36 +0200] rev 14476
merge with hg-i18n
Martin Geisler <mg@lazybytes.net> [Mon, 30 May 2011 11:52:17 +0200] rev 14475
test-gendoc: update for new Russian translation
Alexander Sauta <demosito@gmail.com> [Mon, 30 May 2011 01:24:21 +0400] rev 14474
i18n-ru: branches-import translated
Alexander Sauta <demosito@gmail.com> [Sun, 29 May 2011 02:33:36 +0400] rev 14473
i18n-ru:bisect,backout,branch translated
Alexander Sauta <demosito@gmail.com> [Sun, 29 May 2011 01:42:59 +0400] rev 14472
i18n-ru: translated add, addremove, annotate, archive
Alexander Sauta <demosito@gmail.com> [Sun, 29 May 2011 01:31:12 +0400] rev 14471
i18n-ru:translation started,convert translated
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 19 May 2011 16:25:26 -0300] rev 14470
i18n-pt_BR: synchronized with ab687820c4cc
Eric Eisner <ede@alum.mit.edu> [Sat, 28 May 2011 11:03:48 -0400] rev 14469
subrepo: don't crash when git .hgsubstate is empty (issue2716)
Idan Kamara <idankk86@gmail.com> [Mon, 30 May 2011 21:44:03 +0300] rev 14468
mq: no need to make a copy of seriesopts
the command decorator takes care of copying the
options (introduced in 5b48ad1e7f1a)
Adrian Buehlmann <adrian@cadifra.com> [Fri, 27 May 2011 21:11:44 +0200] rev 14467
workingctx.remove: use self.forget
Martin Geisler <mg@aragost.com> [Tue, 31 May 2011 13:18:56 +0200] rev 14466
commands: use repo.branchheads in heads command
Martin Geisler <mg@aragost.com> [Tue, 31 May 2011 09:59:03 +0200] rev 14465
commands: remove unused variable from heads command
The b variable has not been needed since fd511e9eeea6. Renamed ls
variable to bheads for clarity.
Martin Geisler <mg@aragost.com> [Tue, 31 May 2011 08:47:16 +0200] rev 14464
mq: print "'foo' 'bar'", not "['foo', 'bar']" when showing guards
The internal list representation of guards was leaking into the
output. The guards were always printed using repr(guard) and that
style was kept.
When "hg qguard -l" prints several guards for a patch, it does so by
joining the names with " " and that style was used for the error
messages too.
Martin Geisler <mg@aragost.com> [Fri, 27 May 2011 12:42:36 +0200] rev 14463
hg: remove underscores in clone function
Idan Kamara <idankk86@gmail.com> [Sun, 29 May 2011 13:43:50 +0300] rev 14462
hg-ssh: fix dispatch call to use dispatch.request()
08bfec2ef031 changed dispatch.dispatch() to accept a
request object instead of a list of arguments
Martin Geisler <mg@lazybytes.net> [Mon, 30 May 2011 11:18:47 +0200] rev 14461
gendoc: config help topic is in hgrc.5, do not include it in hg.1
Martin Geisler <mg@lazybytes.net> [Mon, 30 May 2011 11:15:25 +0200] rev 14460
doc: improve merge between hgrc.5 and config help topic
Martin Geisler <mg@lazybytes.net> [Mon, 30 May 2011 11:14:31 +0200] rev 14459
doc: rebuild hgrc.5 man and HTML page when help/config changes
Martin Geisler <mg@lazybytes.net> [Mon, 30 May 2011 10:35:43 +0200] rev 14458
help/config: separate terms with a blank line
This makes it easier for translators since they can then translate
each term individually.
Martin Geisler <mg@lazybytes.net> [Mon, 30 May 2011 10:30:46 +0200] rev 14457
help/config: fix rendering of definition list
Without the blank line, the minirst parser renders
Term-1
Line-1
Line-2
Term-2
Line-1
as
Term-1
Line-1
Line-2 Term-2 Line-1
because the second term is seen as a paragraph.
Yun Lee <yun.lee.bj@gmail.com> [Mon, 30 May 2011 10:21:39 +0200] rev 14456
help: move part of hgrc.5 man page config help topic
Yun Lee <yun.lee.bj@gmail.com> [Mon, 30 May 2011 10:05:39 +0200] rev 14455
hgrc.5: make minirst find headings correctly
The minirst parser is stricter than Docutils here and require a blank
after a heading. Otherwise the heading is classified as a paragraph.
Patrick Mezard <pmezard@gmail.com> [Sat, 28 May 2011 11:44:27 +0200] rev 14454
run-tests: fix --blacklist (broken by 95715c2f90bf)
Patrick Mezard <pmezard@gmail.com> [Fri, 27 May 2011 21:50:11 +0200] rev 14453
patch: do not patch unknown files (issue752)
Patrick Mezard <pmezard@gmail.com> [Fri, 27 May 2011 21:50:10 +0200] rev 14452
patch: use temporary files to handle intermediate copies
git patches may require copies to be handled out-of-order. For instance, take
the following sequence:
* modify a
* copy a into b
Here, we have to generate b from a before its modification. To do so,
applydiff() was scanning for copy metadata and performing the copies before
processing the other changes in-order. While smart and efficient, this approach
complicates things by handling file copies and file creations at different
places and times. While a new file must not exist before being patched a copied
file already exists before applying the first hunk.
Instead of copying the files at their final destination before patching, we
store them in a temporary file location and retrieve them when patching. The
filestore always stores file content in real files but nothing prevents adding
a cache layer. The filestore class was kept separate from fsbackend for at
least two reasons:
- This class is likely to be reused as a temporary result store for a future
repository patching call (entries just have to be extended to contain copy
sources).
- Delegating this role to backends might be more efficient in a repository
backend case: the source files are already available in the repository itself
and do not need to be copied again. It also means that third-parties backend
would have to implement two other methods. If we ever decide to merge the
filestore feature into backend, a minimalistic approach would be to compose
with filestore directly. Keep in mind this copy overhead only applies for
copy/rename sources, and may even be reduced to copy sources which have to
handled ahead of time.
Patrick Mezard <pmezard@gmail.com> [Fri, 27 May 2011 21:50:09 +0200] rev 14451
patch: refactor file creation/removal detection
The patcher has to know if a file is being created or removed to check if the
target already exists, or to actually unlink the file when a hunk emptying it
is applied. This was done by embedding the creation/removal information in the
first (and only) hunk attached to the file.
There are two problems with this approach:
- creation/removal is really a property of the file being patched and not its
hunk.
- for regular patches, file creation cannot be deduced at parsing time: there
are case where the *stripped* file paths must be compared. Modifying hunks
after their creation is clumsy and prevent further refactorings related to
copies handling.
Instead, we delegate this job to selectfile() which has all the relevant
information, and remove the hunk createfile() and rmfile() methods.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 27 May 2011 15:59:52 +0200] rev 14450
commands.remove: don't use workingctx.remove(list, unlink=True)
workingctx.remove(list, unlink=True) is unsuited here, because it does too
much: it also unlinks added files. But the command 'hg remove' is specified
to *never* unlink added files.
Instead, we now unlink the files at the commands.remove level (if --after was
not specified) and use workingctx.forget for all files.
As an added bonus, this happens to eliminate a wlock acquire/release pair,
since the previous implementation caused
acquire wlock
release wlock
acquire wlock
release wlock
where the first pair of acquire/release was caused by the workingctx.forget
call, and the second by the workingctx.remove call.
Idan Kamara <idankk86@gmail.com> [Fri, 27 May 2011 17:51:16 +0300] rev 14449
tests: add a test to check for duplicate command options
Idan Kamara <idankk86@gmail.com> [Fri, 27 May 2011 17:49:54 +0300] rev 14448
mq: allow --mq for qrecord
Idan Kamara <idankk86@gmail.com> [Fri, 27 May 2011 17:46:48 +0300] rev 14447
run-tests: fix --blacklist with jobs > 1
filter blacklisted tests before partitioning them
to the children.
maintains the 'Skipped...' output but not the 's'.
Idan Kamara <idankk86@gmail.com> [Fri, 27 May 2011 17:46:47 +0300] rev 14446
run-tests: slightly simplify blacklist check
Matt Mackall <mpm@selenic.com> [Fri, 27 May 2011 08:50:27 -0500] rev 14445
coal: use preformatted text for descriptions (issue2835)
The coal style was broken here by an earlier change to paper, which
shares files.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 27 May 2011 10:03:29 +0200] rev 14444
rebase: add option --tool/-t for 'pull --rebase'
This makes 'pull --rebase' consistent with the merge command, which already
provides that option to control the merges
Martin Geisler <mg@aragost.com> [Fri, 27 May 2011 11:01:44 +0200] rev 14443
subrepo: refactor writestate for clarity
Matt Mackall <mpm@selenic.com> [Thu, 26 May 2011 17:15:35 -0500] rev 14442
cmdutil: make private copies of option lists to avoid sharing monkeypatches
Idan Kamara <idankk86@gmail.com> [Thu, 26 May 2011 19:00:47 +0300] rev 14441
record: fix options placeholder
Paul Molodowitch <pm@stanfordalumni.org> [Wed, 25 May 2011 08:38:58 -0700] rev 14440
subrepo: bare git repos considered dirty
Currently, if there is a bare git subrepo, but it is at the "right"
revision, calling dirty() will error because diff-index does not work
on bare repos. This patch makes it so bare subrepos are always
considered dirty.
Idan Kamara <idankk86@gmail.com> [Thu, 26 May 2011 00:53:23 +0300] rev 14439
dispatch: use the request to store the ui object
and check if we got one before creating.
note that the contents of the ui object might change after
dispatch() returns (by options passed through --config for example),
to ensure it doesn't, pass a copy() of it.
Idan Kamara <idankk86@gmail.com> [Thu, 26 May 2011 00:44:11 +0300] rev 14438
dispatch: wrap dispatch related information in a request class
currently only stores the arguments.
Steven Brown <StevenGBrown@gmail.com> [Thu, 26 May 2011 22:51:02 +0800] rev 14437
patch: restore the previous output of 'diff --stat'
Restore the previous diffstat behaviour of scaling by the maximum number of
changes to a single file. Changeset f03f08240c32 modified the diffstat to be
scaled by the total number of changes. This seems to have been unintentional.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 24 May 2011 17:48:16 +0200] rev 14436
wireproto: enable optional args for known() for future extensibility
Firstly, I think we should do this for all new wire commands, just
to be on the safe side. So I want to get this into the 1.9 release.
Secondly, there actually is potential here that sometimes the server
can know that the number of its nodes which can possibly still be
undecided on the client is small. It might then just send them along
directly (cutting short the end game). This, however, requires
walking the graph on the server, which can be expensive, so for the
moment we're not actually doing it.
Matt Mackall <mpm@selenic.com> [Thu, 26 May 2011 17:15:35 -0500] rev 14435
context: make forget work like commands.forget
Switch users of wctx.delete(..., False) to forget.
Matt Mackall <mpm@selenic.com> [Thu, 26 May 2011 17:15:35 -0500] rev 14434
dirstate: rename forget to drop
It has substantially different semantics from forget at the command
layer, so change it to avoid confusion.
We can't simply combine it with remove because we need to explicitly
drop non-added files in some cases like commit.
Martin Geisler <mg@aragost.com> [Thu, 26 May 2011 10:46:34 +0200] rev 14433
minirst: read test input from stdin
Sune Foldager <cryo@cyanite.org> [Thu, 26 May 2011 11:11:34 +0200] rev 14432
tests: update monotone version requirement
Patrick Mezard <pmezard@gmail.com> [Wed, 25 May 2011 10:06:17 +0200] rev 14431
test-git-import: test patching existing copy targets
Matt Mackall <mpm@selenic.com> [Tue, 24 May 2011 17:30:00 -0500] rev 14430
httprepo: handle large lengths by bypassing the len() operator
Adrian Buehlmann <adrian@cadifra.com> [Tue, 24 May 2011 14:52:23 +0200] rev 14429
workingctx.remove: don't stat files again after unlinking
we already know at this point that they have been unlinked
Matt Mackall <mpm@selenic.com> [Tue, 24 May 2011 17:16:31 -0500] rev 14428
httprepo: send URL redirection notices to stderr (issue2828)
Idan Kamara <idankk86@gmail.com> [Tue, 24 May 2011 19:17:22 +0300] rev 14427
record: alias qrecord to qnew -i/--interactive
Idan Kamara <idankk86@gmail.com> [Tue, 24 May 2011 19:17:19 +0300] rev 14426
record: add qrefresh -i/--interactive
interactively select changes to refresh
Idan Kamara <idankk86@gmail.com> [Tue, 24 May 2011 19:17:04 +0300] rev 14425
record: add an option to backup all wc modifications
Also, don't create a backup dir if we have no files to backup.
This is essential for qrefresh --interactive. Since we can't
select individual files to qrefresh without eliminating already
present changes, we have to backup all changes in the working
copy to avoid refreshing unaccepted hunks.
(thanks to Patrick for the idea)
Idan Kamara <idankk86@gmail.com> [Tue, 24 May 2011 19:17:02 +0300] rev 14424
record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com> [Tue, 24 May 2011 19:16:51 +0300] rev 14423
mq: use checkpatchname
This also fixes a bug where qrename would allow
renaming a patch to a reserved name.
Idan Kamara <idankk86@gmail.com> [Tue, 24 May 2011 19:16:51 +0300] rev 14422
mq: wrap patch file name checks in a function
Augie Fackler <durin42@gmail.com> [Tue, 24 May 2011 13:30:10 -0500] rev 14421
pure parsers: properly detect corrupt index files
This new Python code should be equivalent in behavior to the if
statement at line 312 of parsers.c. Without this, the pure-python
parsers improperly ignore truncated revlogs as created in
test-verify.t.
Adrian Buehlmann <adrian@cadifra.com> [Tue, 24 May 2011 14:08:20 +0200] rev 14420
workingctx: unlink paths while holding the wlock
Martin Geisler <mg@aragost.com> [Tue, 24 May 2011 16:12:01 +0200] rev 14419
wireproto: do not hash when heads == ['force']
Changeset 88f0e41d8802 introduced the unbundlehash capability and
unconditionally hashed the heads on the client side. By mistake, the
heads were also cased in the heads == ['force'] case.
Patrick Mezard <pmezard@gmail.com> [Tue, 24 May 2011 14:21:04 +0200] rev 14418
patch: remove EOL support from linereader class
This was only used when reading patched files which is now done by backends.
Matt Mackall <mpm@selenic.com> [Mon, 23 May 2011 22:49:10 -0500] rev 14417
subrepo: handle local added subrepo case correctly
Idan Kamara <idankk86@gmail.com> [Mon, 23 May 2011 23:22:47 +0300] rev 14416
graphlog: remove unused arg from _wrapcmd
Idan Kamara <idankk86@gmail.com> [Mon, 23 May 2011 23:09:00 +0300] rev 14415
extensions: raise when trying to find an extension that failed to load
extensions that depend on other extensions (such as record) use this pattern
to check if the dependant extension is available:
try:
mq = extensions.find('mq')
except KeyError:
return
but since if an error occurs while loading an extension it leaves its entry
in the _extensions map as None, we want to raise in that situation too.
(rather than adding another check if the return value is None)
Adrian Buehlmann <adrian@cadifra.com> [Mon, 23 May 2011 15:56:31 +0200] rev 14414
remove: clarify help text about added files never being deleted from disk
Adrian Buehlmann <adrian@cadifra.com> [Wed, 18 May 2011 09:12:27 +0200] rev 14413
pure: provide more correct implementation of posixfile for Windows
requires ctypes
Why is posixfile a class?
Because the implementation needs to use the Python library call os.fdopen [1],
which sets the 'name' attribute on the Python file object it creates to the
mostly meaningless string '<fdopen>', since file descriptors don't have a name.
But users of posixfile depend on the name attribute [2] being set to a proper
value, like Python's built-in 'open' function sets it on file objects.
Python file's name attribute is read-only, so we can't just assign to it after
the file object has alrady been created.
To solve this problem, we save the name of the file on a wrapper object,
and delegate the file function calls to the wrapped (private) file object
using __getattr__.
[1] http://docs.python.org/library/os.html#os.fdopen
[2] http://docs.python.org/library/stdtypes.html#file.name
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 23 May 2011 20:35:10 +0200] rev 14412
bundlerepo: make getremotechanges support filtering of incoming
Extensions can hook discovery.findcommonincoming to filter out unwanted remote
changesets. This patch makes getremotechanges respect the changed remote heads
returned by such extensions.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 23 May 2011 20:32:29 +0200] rev 14411
tests: add tests for discovery/pull without cgsubset
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 23 May 2011 20:31:39 +0200] rev 14410
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 23 May 2011 20:31:04 +0200] rev 14409
tests: support multiple caps in notcapable
Idan Kamara <idankk86@gmail.com> [Sun, 22 May 2011 16:10:03 +0300] rev 14408
record: use cmdutil.command decorator
Idan Kamara <idankk86@gmail.com> [Sun, 22 May 2011 16:10:02 +0300] rev 14407
record: suggest the right command when running non interactively
Adrian Buehlmann <adrian@cadifra.com> [Sun, 22 May 2011 11:03:15 +0200] rev 14406
applyupdates: audit merged files
protects changing flags on merged files (util.setflags call on line 341)
Adrian Buehlmann <adrian@cadifra.com> [Sat, 21 May 2011 23:21:12 +0200] rev 14405
applyupdates: audit path on flag changes
we're using the auditor of the repo wopener, since this is a path that belongs
to the tree we're updating to
Adrian Buehlmann <adrian@cadifra.com> [Sat, 21 May 2011 23:13:59 +0200] rev 14404
opener: add audit function
Matt Mackall <mpm@selenic.com> [Sat, 21 May 2011 15:09:15 -0500] rev 14403
templatekw: use diffstatsum in diffstat keyword
Matt Mackall <mpm@selenic.com> [Sat, 21 May 2011 15:06:38 -0500] rev 14402
patch: use diffstatsum in diffstat
Matt Mackall <mpm@selenic.com> [Sat, 21 May 2011 15:06:36 -0500] rev 14401
patch: add diffstatsum helper
Matt Mackall <mpm@selenic.com> [Sat, 21 May 2011 15:01:28 -0500] rev 14400
diffstatdata: no longer a generator
This produces a smallish amount of data and all consumers needed to
buffer it anyway.
Adrian Buehlmann <adrian@cadifra.com> [Wed, 18 May 2011 21:31:40 +0200] rev 14399
add new option --all to manifest command
prints a list of all files in all revisions of the repo
obsoletes the cifiles extension
Adrian Buehlmann <adrian@cadifra.com> [Sat, 21 May 2011 02:05:00 +0200] rev 14398
applyupdates: audit unlinking of renamed files and directories
Idan Kamara <idankk86@gmail.com> [Fri, 20 May 2011 21:04:45 +0300] rev 14397
patchbomb: pass --git argument to diffstat
Idan Kamara <idankk86@gmail.com> [Fri, 20 May 2011 21:20:24 +0300] rev 14396
mq: strip all leading slashes from url when importing
When trying to import a url that ends with a slash
os.path.basename() would return an empty string. So
when seeing a leading slash, remove it and infer the
patch name from the remaining url.
e.g. `hg qimport http://paste.pocoo.org/raw/xxx/`
deduced '.' to be the patch name. Now we'll deduce 'xxx'.
Idan Kamara <idankk86@gmail.com> [Fri, 20 May 2011 21:19:33 +0300] rev 14395
mq: check patch name is valid before reading imported file
Matt Mackall <mpm@selenic.com> [Sat, 21 May 2011 15:01:28 -0500] rev 14394
tests: update monotone output for v1.0 changes
Matt Mackall <mpm@selenic.com> [Sat, 21 May 2011 15:01:28 -0500] rev 14393
revlog: stop exporting node.short
Patrick Mezard <pmezard@gmail.com> [Thu, 19 May 2011 22:55:13 +0200] rev 14392
patch: fast-path git case in selectfile()
We avoid a lot of complicated heuristics in git cases, where these heurestics
may even be broken when copies are involved.
Patrick Mezard <pmezard@gmail.com> [Thu, 19 May 2011 22:49:43 +0200] rev 14391
patch: unify backend file access interface
- Rename readlines() into getfile(), return data and mode
- Make setfile() write a data buffer instead of lines, make mode mandatory.
Patrick Mezard <pmezard@gmail.com> [Thu, 19 May 2011 22:44:01 +0200] rev 14390
patch: merge backend setmode() into writelines()
Copy handling will be easier to handle in a single method.
Patrick Mezard <pmezard@gmail.com> [Thu, 19 May 2011 22:44:01 +0200] rev 14389
patch: stop modifying gitpatch objects
gitpatch objects emitted by iterhunks() were referencing file paths unmodified
from the input patch. _applydif() made them usable by modifying the gitpatch
objects in-place with specified path strip level. The same modified objects
were then reused by iterhunks() generator. _applydiff() now copies and update
the paths which completely decouples both routines.
As a side effect, the "git" event now receives only metadata about
copies/renames to perform the necessary copies ahead of time. Other actions are
handled in the "file" event.
Patrick Mezard <pmezard@gmail.com> [Thu, 19 May 2011 22:44:01 +0200] rev 14388
patch: stop handling hunkless git blocks out of stream
Patch changes are emitted by iterhunks() in two separate events: 'file' when
hunks have to be applied and 'git' to describe other modifications like copies
or mode changes. Note that a file which mode is changed and which content is
modified by the same patch will be emitted in both events. It is more
convenient to handle all file modifications in a single event. This patch
"zips" git actions with regular changes so both kinds can be emitted at the
same place.
Patrick Mezard <pmezard@gmail.com> [Thu, 19 May 2011 22:44:01 +0200] rev 14387
patch: reindent code
Patrick Mezard <pmezard@gmail.com> [Thu, 19 May 2011 22:44:01 +0200] rev 14386
patch: unify iterhunks() afile/bfile handling
git afile/bfile are extracted twice, once when reading a 'diff --git', and
again when reading a unified hunk. The problem is not all git blocks have
unified hunks (renames just have metadata) and they were not extracted the same
way. This is what this patch unifies.
Patrick Mezard <pmezard@gmail.com> [Thu, 19 May 2011 22:44:01 +0200] rev 14385
patch: git metadata was ignored if strip > 1
gitpatch objects emitted by iterhunks() are modified in place by applydiff().
Processing them earlier improves iterhunks() isolation. applydiff() modifying
them should still be fixed though.
Patrick Mezard <pmezard@gmail.com> [Thu, 19 May 2011 22:44:01 +0200] rev 14384
patch: construct and parse binary hunks at the same time
Patrick Mezard <pmezard@gmail.com> [Thu, 19 May 2011 22:44:01 +0200] rev 14383
patch: refactor iterhunks() regular and binary files emission
Patrick Mezard <pmezard@gmail.com> [Thu, 19 May 2011 22:44:01 +0200] rev 14382
patch: remove patch.patch() cwd argument
Patrick Mezard <pmezard@gmail.com> [Thu, 19 May 2011 22:44:01 +0200] rev 14381
patch: merge _updatedir() into externalpatch()
Martin Geisler <mg@aragost.com> [Thu, 19 May 2011 18:10:03 +0200] rev 14380
merge with stable
Martin Geisler <mg@aragost.com> [Thu, 19 May 2011 18:09:25 +0200] rev 14379
changelog: convert user and desc from local encoding early
Failing to do so makes it impossible to use the memctx API to create a
changeset with a commit message or username outside of the current
encoding.encoding setting.
Martin Geisler <mg@aragost.com> [Thu, 19 May 2011 16:57:14 +0200] rev 14378
merge crew with main
Brendan Cully <brendan@kublai.com> [Wed, 18 May 2011 23:20:26 -0700] rev 14377
clone: make default path absolute for all local paths
This fixes the default path when cloning local repositories with hg-git, since
hg-git cancopy() is false even for local repositories.
Augie Fackler <durin42@gmail.com> [Tue, 17 May 2011 10:28:03 -0500] rev 14376
httpclient: import revision fc731618702a of py-nonblocking-http
Augie Fackler <durin42@gmail.com> [Mon, 16 May 2011 16:59:45 -0500] rev 14375
httpconnection: improved logging formatting
I had to use this debugging output for the first time recently when
looking for a problem, and the lack of good formatting made things
difficult.
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> [Tue, 17 May 2011 00:46:52 +0200] rev 14374
bash_completion: enable alias auto-complete
When auto-completing, set HGPLAINEXCEPT=alias to list aliases
in the suggestions.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> [Tue, 17 May 2011 00:17:52 +0200] rev 14373
ui: enable alias exception when reading config in plain mode
When in plain mode with "alias" present in the exception list,
keep the aliases. This will be used later to enable auto-completion.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> [Tue, 17 May 2011 00:08:51 +0200] rev 14372
ui: test plain mode against exceptions
Let ui.plain() accept an optional parameter in the form of a feature
name (as a string) to exclude from plain mode.
The result of ui.plain is now:
- False if HGPLAIN is not set or the requested feature is in HGPLAINEXCEPT
- True otherwise
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Matt Mackall <mpm@selenic.com> [Wed, 18 May 2011 17:05:30 -0500] rev 14371
revlog: drop base() again
deltaparent does what's needed, and more "portably".
Patrick Mezard <pmezard@gmail.com> [Wed, 18 May 2011 23:48:17 +0200] rev 14370
patch: add a workingbackend dirstate layer on top of fsbackend
_updatedir() is no longer used by internalpatch()
The change in test-mq-missingfiles.t comes from workingbackend not considering
the missing 'b' file as changed, thus not calling addremove() on it.
Patrick Mezard <pmezard@gmail.com> [Wed, 18 May 2011 23:48:13 +0200] rev 14369
patch: handle binary copies as regular ones
This introduces a performance regression for large files, as they will be
copied just to be clobbered afterwards since binary patching does not use
deltas. But it simplifies the code and the previous optimization will be
reintroduced later in a better way.
Patrick Mezard <pmezard@gmail.com> [Wed, 18 May 2011 23:48:13 +0200] rev 14368
patch: remove files while patching, not in updatedir()
At this point, updatedir() only reads the working directory and update the
dirstate.
Patrick Mezard <pmezard@gmail.com> [Wed, 18 May 2011 23:48:13 +0200] rev 14367
patch: set desired mode when patching, not in updatedir()
This patch and the following aim at merging _updatedir() actions into
_applydiff().
Patrick Mezard <pmezard@gmail.com> [Wed, 18 May 2011 23:48:13 +0200] rev 14366
patch: stop changing current directory before patching
_applydiff() patcher argument was added to help hgsubversion like extension
monkeypatching the patching process. While it could be removed at this point, I
prefer to leave it until patch.py is completely refactored and there is a valid
and tested alternative.
Sune Foldager <cryo@cyanite.org> [Wed, 18 May 2011 23:26:26 +0200] rev 14365
revlog: linearize created changegroups in generaldelta revlogs
This greatly improves the speed of the bundling process, and often reduces the
bundle size considerably. (Although if the repository is already ordered, this
has little effect on both time and bundle size.)
For non-generaldelta clients, the reduced bundle size translates to a reduced
repository size, similar to shrinking the revlogs (which uses the exact same
algorithm). For generaldelta clients the difference is minor.
When the new bundle format comes, reordering will not be necessary since we
can then store the deltaparent relationsships directly. The eventual default
behavior for clients and servers is presented in the table below, where "new"
implies support for GD as well as the new bundle format:
old client new client
old server old bundle, no reorder old bundle, no reorder
new server, non-GD old bundle, no reorder[1] old bundle, no reorder[2]
new server, GD old bundle, reorder[3] new bundle, no reorder[4]
[1] reordering is expensive on the server in this case, skip it
[2] client can choose to do its own redelta here
[3] reordering is needed because otherwise the pull does a lot of extra
work on the server
[4] reordering isn't needed because client can get deltabase in bundle
format
Currently, the default is to reorder on GD-servers, and not otherwise. A new
setting, bundle.reorder, has been added to override the default reordering
behavior. It can be set to either 'auto' (the default), or any true or false
value as a standard boolean setting, to either force the reordering on or off
regardless of generaldelta.
Some timing data from a relatively branch test repository follows. All
bundling is done with --all --type none options.
Non-generaldelta, non-shrunk repo:
-----------------------------------
Size: 276M
Without reorder (default):
Bundle time: 14.4 seconds
Bundle size: 939M
With reorder:
Bundle time: 1 minute, 29.3 seconds
Bundle size: 381M
Generaldelta, non-shrunk repo:
-----------------------------------
Size: 87M
Without reorder:
Bundle time: 2 minutes, 1.4 seconds
Bundle size: 939M
With reorder (default):
Bundle time: 25.5 seconds
Bundle size: 381M
Sune Foldager <cryo@cyanite.org> [Wed, 18 May 2011 23:11:34 +0200] rev 14364
revlogdag: add linearize function
See the docstring for a detailed explanation. The linearizer was originally
written by Benoit Boissinot.
Martin Geisler <mg@lazybytes.net> [Wed, 18 May 2011 19:30:17 +0200] rev 14363
localrepo, sshrepo: use Boolean create argument in __init__
Martin Geisler <mg@lazybytes.net> [Wed, 18 May 2011 19:25:34 +0200] rev 14362
commands: replace 'x = f(); return x' with 'return f()'
Martin Geisler <mg@lazybytes.net> [Wed, 18 May 2011 19:22:55 +0200] rev 14361
merge with stable
Martin Geisler <mg@aragost.com> [Wed, 18 May 2011 15:13:26 +0200] rev 14360
subrepo: respect non-default path for incoming/outgoing
Push and pull set repo._subtoppath before pushing or pulling subrepos.
The incoming and outgoing commands needed to do the same.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 18 May 2011 15:45:57 +0200] rev 14359
run-tests: print a newline after all warnings
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 18 May 2011 15:41:03 +0200] rev 14358
annotate: fix alignment of columns in front of line numbers (issue2807)
Martin Geisler <mg@aragost.com> [Wed, 18 May 2011 09:56:27 +0200] rev 14357
merge with stable
Martin Geisler <mg@aragost.com> [Wed, 18 May 2011 09:31:19 +0200] rev 14356
revset: the name is optional for the tag predicate
Martin Geisler <mg@aragost.com> [Wed, 18 May 2011 09:28:11 +0200] rev 14355
revset: note case-sensitive match in grep
Martin Geisler <mg@aragost.com> [Wed, 18 May 2011 09:20:52 +0200] rev 14354
revset: note case-insensitive matches in keyword and user
Martin Geisler <mg@aragost.com> [Wed, 18 May 2011 09:15:18 +0200] rev 14353
revset: expand help for contains predicate
Sune Foldager <cryo@cyanite.org> [Wed, 18 May 2011 09:05:18 +0200] rev 14352
patch: remove unused variable to make pyflakes test happy
Patrick Mezard <pmezard@gmail.com> [Tue, 17 May 2011 23:46:38 +0200] rev 14351
patch: add lexists() to backends, use it in selectfile()
At this point, all applydiff() filesystem calls should pass through fsbackend.
Patrick Mezard <pmezard@gmail.com> [Tue, 17 May 2011 23:46:38 +0200] rev 14350
patch: move copyfile() into backends, abstract basedir
Patrick Mezard <pmezard@gmail.com> [Tue, 17 May 2011 23:46:37 +0200] rev 14349
patch: merge makerejlines() into write_rej()
Patrick Mezard <pmezard@gmail.com> [Tue, 17 May 2011 23:46:15 +0200] rev 14348
patch: extract fs access from patchfile into fsbackend
Most filesystem calls are already isolated in patchfile but this is not enough:
renames are performed before patchfile is available and some chmod calls are
even done outside of the applydiff call. Once all these calls are extracted
into a backend class, we can provide cleaner APIs to write to a working
directory context directly into the repository.
Patrick Mezard <pmezard@gmail.com> [Tue, 17 May 2011 23:27:58 +0200] rev 14347
mq: fix qpush changes detection of renamed files
patch.changedfile() was not considering renamed file source as changed.
Augie Fackler <durin42@gmail.com> [Mon, 16 May 2011 16:59:45 -0500] rev 14346
httpconnection: correctly handle redirects from http to https
Previously the connection cache for keepalives didn't keep track of
ssl. This meant that when we connected to an https server after that
same server via http, both on the default port, we'd incorrectly reuse
the non-https connection as the default port meant the connection
cache key was the same.
Adrian Buehlmann <adrian@cadifra.com> [Sun, 15 May 2011 21:33:51 +0200] rev 14345
win32.py: add argtypes and restype
This is a feature of ctypes. Without these, pypy complains with
RuntimeWarning: C function without declared arguments called
RuntimeWarning: C function without declared return type called
As a side effect of specifying restypes, the return value of e.g. CreateFileA
is now implicitly converted to an instance of _HANDLE, so we also need to
change the definition
_INVALID_HANDLE_VALUE = -1
to
_INVALID_HANDLE_VALUE = _HANDLE(-1).value
Otherwise, tests for equality to _INVALID_HANDLE_VALUE in code like
def _getfileinfo(name):
fh = _kernel32.CreateFileA(name, 0,
_FILE_SHARE_READ | _FILE_SHARE_WRITE | _FILE_SHARE_DELETE,
None, _OPEN_EXISTING, 0, None)
if fh == _INVALID_HANDLE_VALUE:
_raiseoserror(name)
would now fail to detect an invalid handle, which in turn would lead to
exceptions raised with wrong errno values, like e.g.
>>> nlinks('missing.txt')
Traceback (most recent call last):
...
OSError: [Errno 9] missing.txt: The handle is invalid.
instead of the correct (as per this patch and before it)
>>> nlinks('missing.txt')
Traceback (most recent call last):
...
OSError: [Errno 2] missing.txt: The system cannot find the file specified.
Adrian Buehlmann <adrian@cadifra.com> [Sun, 15 May 2011 21:27:59 +0200] rev 14344
win32.py: more explicit definition of _STD_ERROR_HANDLE
Matt Mackall <mpm@selenic.com> [Mon, 16 May 2011 17:02:35 -0500] rev 14343
revset: add follow(filename) to follow a filename's history across copies
Matt Mackall <mpm@selenic.com> [Mon, 16 May 2011 17:02:35 -0500] rev 14342
revset: introduce filelog() to emulate log's fast path
filelog() only reports revisions present in the matching filelogs.
Augie Fackler <durin42@gmail.com> [Thu, 12 May 2011 10:48:31 -0500] rev 14341
httpclient: import revision b8c3511a8cae from py-nonblocking-http
Fixes issues with SSL_ERROR_WANT_READ incorrectly breaking the
response read.
Patrick Mezard <pmezard@gmail.com> [Mon, 16 May 2011 21:56:26 +0200] rev 14340
run-tests: replace chdir() with Popen cwd option
Patrick Mezard <pmezard@gmail.com> [Mon, 16 May 2011 21:54:43 +0200] rev 14339
run-tests: make --debug run in the temporary test directory
Patrick Mezard <pmezard@gmail.com> [Mon, 16 May 2011 21:52:28 +0200] rev 14338
run-tests: use the common test path on Windows and Java
The alternate one did not run in the test directory and controlling
the jobs execution with threads instead of process made it harder
to fix.
Patrick Mezard <pmezard@gmail.com> [Mon, 16 May 2011 21:41:46 +0200] rev 14337
run-tests: ignore timeout when Popen.terminate is unavailable
Popen.terminate was introduced in python 2.6
Patrick Mezard <pmezard@gmail.com> [Mon, 16 May 2011 21:26:50 +0200] rev 14336
run-tests: fix hg.bat python reference
hg.bat expects to live in pythonxx/scripts and the python interpreter
to be in pythonxx. run-tests.py file layout is a little different and
python location must be fixed.
Patrick Mezard <pmezard@gmail.com> [Mon, 16 May 2011 21:24:14 +0200] rev 14335
run-tests: fix python executable detection and copy on Windows
Sune Foldager <cryo@cyanite.org> [Mon, 16 May 2011 13:06:48 +0200] rev 14334
changelog: don't use generaldelta
Sune Foldager <cryo@cyanite.org> [Mon, 16 May 2011 12:44:34 +0200] rev 14333
revlog: get rid of defversion
defversion was a property (later option) on the store opener, used to propagate
the changelog revlog format to the other revlogs, so they would be created with
the same format.
This required that the changelog instance was created before any other revlog;
an invariant that wasn't directly enforced (or documented) anywhere.
We now use the revlogv1 requirement instead, which is transfered to the store
opener options. If this option is missing, v0 revlogs are created.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 16 May 2011 11:52:28 +0200] rev 14332
bash_completion: Use "hg paths -q" instead of piping through sed
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 16 May 2011 11:41:48 +0200] rev 14331
paths: Add support for -q/--quiet
Suppresses output (resolved paths or "not found!") when searching a path,
similar to "grep -q".
Sample usage: hg paths -q foo || echo "there is no foo"
Just prints path names (instead of "name = result") when listing all path
definitions, like "hg bookmarks -q".
Sample usage: hg paths -q | while read i; do hg incoming "$i"; done
Sune Foldager <cryo@cyanite.org> [Mon, 16 May 2011 11:14:06 +0200] rev 14330
fix test broken in merge from stable
Matt Mackall <mpm@selenic.com> [Sun, 15 May 2011 13:15:41 -0500] rev 14329
merge with stable
Steve Borho <steve@borho.org> [Fri, 13 May 2011 19:46:36 -0500] rev 14328
simplemerge: do not allow binary files to abort an entire merge
When used as the default merge tool, or used as a --tool override,
the simplemerge script should not be allowed to raise a util.Abort
just because one of the files being merged is binary. Instead, return
1 and mark the file unresolved.
Javi Merino <cibervicho@gmail.com> [Sun, 15 May 2011 18:00:22 +0100] rev 14327
extdiff: grammar "allows to" -> "allows one to"
The verb to allow requires a direct object.
Lintian, a Debian tool to find common mistakes, reported it. I'm not a
native english speaker but I think this is correct.
Matt Mackall <mpm@selenic.com> [Sun, 15 May 2011 11:50:16 -0500] rev 14326
debugrevlog: add --dump flag to dump graphable per-revision statistics
Matt Mackall <mpm@selenic.com> [Sun, 15 May 2011 11:50:15 -0500] rev 14325
revlog: restore the base method
Brendan Cully <brendan@kublai.com> [Sat, 14 May 2011 22:07:58 -0700] rev 14324
Hardcoding ARCHFLAGS breaks the build against fink's python
Fink's python is either i386 or amd64, but not universal. Setting ARCHFLAGS to the
empty string produces a successful build against both OS X python and fink python.
The modules will no longer be universal -- if that is an issue, we can change the
test to extract ARCHFLAGS from distutils.sysconfig and remove ppc if necessary.
Sune Foldager <cryo@cyanite.org> [Sat, 14 May 2011 00:30:32 +0200] rev 14323
debugindex etc.: add --changelog and --manifest options
These open the changelog and manifest, respectively, directly so you don't
need to specify the path.
The options have been added to debugindex, debugdata and debugrevlog.
The patch also fixes some minor usage-related bugs.
Matt Mackall <mpm@selenic.com> [Fri, 13 May 2011 14:58:24 -0500] rev 14322
scmutil: drop aliases in cmdutil for match functions
Matt Mackall <mpm@selenic.com> [Fri, 13 May 2011 14:48:48 -0500] rev 14321
scmutil: drop some aliases in cmdutil
Matt Mackall <mpm@selenic.com> [Fri, 13 May 2011 14:07:16 -0500] rev 14320
scmutil: fold in wdutil
Matt Mackall <mpm@selenic.com> [Fri, 13 May 2011 14:06:28 -0500] rev 14319
scmutil: move revsingle/pair/range from cmdutil
This allows users at levels below the command layer to avoid import loops.
Matt Mackall <mpm@selenic.com> [Fri, 13 May 2011 12:57:27 -0500] rev 14318
help: consolidate topic hooks in help.py
This removes loops like cmdutil->revset->help->extensions->cmdutil and
simplifies the code.
Matt Mackall <mpm@selenic.com> [Fri, 13 May 2011 11:04:51 -0500] rev 14317
extensions: move moduledoc to break import loop with help
Matt Mackall <mpm@selenic.com> [Fri, 13 May 2011 11:04:51 -0500] rev 14316
extensions: drop maxlength from enabled and disabled
This is a bad/silly API. Instead calculate maxlength in one place in help
it's used and simplify all the callers.
Martin Geisler <mg@aragost.com> [Fri, 13 May 2011 11:26:29 +0200] rev 14315
Makefile: remove pure modules on clean
Cédric Krier <ced@b2ck.com> [Wed, 11 May 2011 18:18:50 +0200] rev 14314
hgcia: Handle URL like in notify (issue2406)
The URL must be composed with baseurl and webroot like in notify
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Thu, 12 May 2011 16:41:56 +0200] rev 14313
util: make str(url) return file:/// for abs paths again
str(url) was recently changed to return only file:/. However, the
canonical way to represent absolute local paths is file:/// [1], which
is also expected by at least hgsubversion.
Relative paths are returned as file:the/relative/path.
[1] http://en.wikipedia.org/wiki/File_URI_scheme
Matt Mackall <mpm@selenic.com> [Thu, 12 May 2011 18:35:04 -0500] rev 14312
subrepo: use a safer revision check for hg repos
This avoids a traceback if the expected revision has been stripped.
Adrian Buehlmann <adrian@cadifra.com> [Thu, 12 May 2011 20:27:35 +0200] rev 14311
graphlog: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com> [Thu, 12 May 2011 20:14:42 +0200] rev 14310
purge: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com> [Thu, 12 May 2011 18:27:05 +0200] rev 14309
patchbomb: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com> [Thu, 12 May 2011 17:50:07 +0200] rev 14308
transplant: use cmdutil.command decorator
Steven Brown <StevenGBrown@gmail.com> [Thu, 12 May 2011 18:06:15 +0800] rev 14307
monoblue: improve readability of the filenolink template
Whitespace changes only. No difference to the rendered page.
Adrian Buehlmann <adrian@cadifra.com> [Thu, 12 May 2011 17:09:56 +0200] rev 14306
rebase: use cmdutil.command decorator
Sune Foldager <cryo@cyanite.org> [Thu, 12 May 2011 22:37:52 +0200] rev 14305
debugrevlog: many improvements
Sune Foldager <cryo@cyanite.org> [Thu, 12 May 2011 18:22:49 +0200] rev 14304
add debugrevlog command
Displays data and statistics about revlogs, including generaldelta details.
Sune Foldager <cryo@cyanite.org> [Thu, 12 May 2011 18:19:28 +0200] rev 14303
check-code: add /= to operator list
Sune Foldager <cryo@cyanite.org> [Thu, 12 May 2011 16:21:01 +0200] rev 14302
order commands alphabetically
Sune Foldager <cryo@cyanite.org> [Thu, 12 May 2011 15:24:33 +0200] rev 14301
revlog: improve delta generation heuristics for generaldelta
Without this change, pulls (and clones) into a generaldelta repository could
generate very inefficient revlogs, the size of which could be at least twice
the original size.
This was caused by the generated delta chains covering too large distances,
causing new chains to be built far too often. This change addresses the
problem by forcing a delta against second parent or against the previous
revision, when the first parent delta is in danger of creating a long chain.
Martin Geisler <mg@aragost.com> [Thu, 12 May 2011 14:31:07 +0200] rev 14300
keyword: use cmdutil.command decorator
Martin Geisler <mg@aragost.com> [Thu, 12 May 2011 14:31:01 +0200] rev 14299
gpg: use cmdutil.command decorator
Martin Geisler <mg@aragost.com> [Thu, 12 May 2011 14:25:08 +0200] rev 14298
mq: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com> [Thu, 12 May 2011 08:14:04 +0200] rev 14297
commands: use a decorator to build table incrementally
this allows to define the table entries near the command functions
Sune Foldager <cryo@cyanite.org> [Thu, 12 May 2011 13:47:17 +0200] rev 14296
revlog: fix bug in chainbase cache
The bug didn't cause corruption, and thus wasn't caught in hg verify or in
tests. It could lead to delta chains longer than normally allowed, by
affecting the code that decides when to add a full revision. This could,
in turn, lead to performance regression.
Zachary Gramana <zgramana@pottsconsultinggroup.com> [Mon, 09 May 2011 15:16:56 -0400] rev 14295
setup.py: workaround for missing bz2 module in IronPython
IronPython does not provide the bz2 module on its own. This patch skips
importing it to allow setup to continue.
(minor tweaks by mpm)
Augie Fackler <durin42@gmail.com> [Wed, 11 May 2011 08:07:51 -0500] rev 14294
httpconnection: fix debug logging option for httpclient
Augie Fackler <durin42@gmail.com> [Wed, 11 May 2011 08:00:48 -0500] rev 14293
httpclient: import f4c380237fd5 to fix keepalive not working
Sune Foldager <cryo@cyanite.org> [Wed, 11 May 2011 11:04:44 +0200] rev 14292
revlog: add docstring to _addrevision
Matt Mackall <mpm@selenic.com> [Tue, 10 May 2011 16:08:47 -0500] rev 14291
cmdutil: make_file to makefileobj
Matt Mackall <mpm@selenic.com> [Tue, 10 May 2011 16:08:46 -0500] rev 14290
cmdutil: make_filename -> makefilename
Matt Mackall <mpm@selenic.com> [Tue, 10 May 2011 16:08:46 -0500] rev 14289
cmdutil: bail_if_changed to bailifchanged
Adrian Buehlmann <adrian@cadifra.com> [Sun, 08 May 2011 23:27:48 +0200] rev 14288
store: change names to comply with project coding standards
as stated at http://mercurial.selenic.com/wiki/CodingStyle
(see also http://selenic.com/pipermail/mercurial-devel/2011-May/031139.html )
name changes done at module scope:
_build_lower_encodefun -> _buildlowerencodefun
_windows_reserved_filenames -> _winreservednames (see 23cd7eeff678)
MAX_PATH_LEN_IN_HGSTORE -> _maxstorepathlen
DIR_PREFIX_LEN -> _dirprefixlen
_MAX_SHORTENED_DIRS_LEN -> _maxshortdirslen
(no users of these outside the store module)
changed locals:
win_reserved -> winreserved
space_left -> spaceleft
Sune Foldager <cryo@cyanite.org> [Tue, 10 May 2011 17:38:58 +0200] rev 14287
filelog: add file function to open other filelogs
Martin Geisler <mg@aragost.com> [Tue, 10 May 2011 14:42:53 +0200] rev 14286
help: add -c/--command flag to only show command help (issue2799)
Martin Geisler <mg@aragost.com> [Tue, 10 May 2011 13:19:05 +0200] rev 14285
help: give hint about 'hg help -e' when appropriate
The hint is only given if a command shadows an extension with the same
name and when that extension has a multi-line module docstring.
Henri Wiechers <hwiechers@gmail.com> [Wed, 20 Jan 2010 20:24:20 +0200] rev 14284
help: add -e/--extension switch to display extension help text
Martin Geisler <mg@aragost.com> [Mon, 09 May 2011 18:11:08 +0200] rev 14283
debugbuilddag: read DAG from stdin if not given on cmdline
Martin Geisler <mg@aragost.com> [Mon, 09 May 2011 17:20:15 +0200] rev 14282
run-tests: remove check on --shell argument
No shell is needed when executing Python tests and finding a good
shell might be difficult/impossible on some platforms (e.g., Windows).
Martin Geisler <mg@aragost.com> [Mon, 09 May 2011 17:15:44 +0200] rev 14281
subrepo: create subrepos using clone instead of pull
Subrepositories used to be created empty and then filled with data
using pull. This is wasteful when you do a clone from a local source
since it means that no hardlinks are created for the subrepos.
This patch make the hgsubrepo._get method check for an empty subrepo
and in that case do a clone instead of a pull. This brings in the same
data as before, but creates hardlinks when possible.
Martin Geisler <mg@aragost.com> [Mon, 09 May 2011 16:41:45 +0200] rev 14280
progress: add speed format
This is not enabled by default, but the user can add it by setting
progress.format.
We might want to let the estimate format output a speed instead of an
ETA if there is not total. Currently estimate just returns the empty
string in that case.
Martin Geisler <mg@aragost.com> [Mon, 09 May 2011 14:40:49 +0200] rev 14279
debugbuilddag: output progress information
Martin Geisler <mg@aragost.com> [Mon, 09 May 2011 14:33:08 +0200] rev 14278
test-debugbuilddag: replace unneeded 'rm -rf' with 'rm -r'
Martin Geisler <mg@aragost.com> [Mon, 09 May 2011 11:01:45 +0200] rev 14277
hgrc.5: document positional arguments in aliases
Martin Geisler <mg@aragost.com> [Mon, 09 May 2011 10:52:08 +0200] rev 14276
merge with stable
Martin Geisler <mg@aragost.com> [Mon, 09 May 2011 10:46:54 +0200] rev 14275
hgrc.5: document shell aliases
Matt Mackall <mpm@selenic.com> [Sun, 08 May 2011 16:41:41 -0500] rev 14274
merge with crew
Adrian Buehlmann <adrian@cadifra.com> [Sun, 08 May 2011 20:45:47 +0200] rev 14273
rename util.is_exec to isexec
Adrian Buehlmann <adrian@cadifra.com> [Sun, 08 May 2011 20:42:28 +0200] rev 14272
posix: delete unused expand_glob
Adrian Buehlmann <adrian@cadifra.com> [Sun, 08 May 2011 20:35:46 +0200] rev 14271
rename util.find_exe to findexe
Sune Foldager <cryo@cyanite.org> [Sun, 08 May 2011 21:32:33 +0200] rev 14270
revlog: support writing generaldelta revlogs
With generaldelta switched on, deltas are always computed against the first
parent when adding revisions. This is done regardless of what revision the
incoming bundle, if any, is deltaed against.
The exact delta building strategy is subject to change, but this will not
affect compatibility.
Generaldelta is switched off by default.
Sune Foldager <cryo@cyanite.org> [Sun, 08 May 2011 21:24:30 +0200] rev 14269
cmdutil: fix errors reported by pyflakes test
Matt Mackall <mpm@selenic.com> [Sun, 08 May 2011 16:16:41 -0500] rev 14268
merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 08 May 2011 11:39:24 -0500] rev 14267
check-code: complain about set.isdisjoint
Alexander Solovyov <alexander@solovyov.net> [Sun, 01 May 2011 13:07:00 +0200] rev 14266
fix bookmarks rollback behavior
Before this patch undo.bookmarks was created on bookmarks write and
not with other transaction-related files. There were two issues: first
is that if you have changed bookmarks few times after a transaction
happened, rollback will give you a state which can point to
non-existing revision. Second is that if you have not changed
bookmarks after a transaction, rollback will touch your state anyway.
This change also adds `localrepo._writejournal` method, which can be
used by other extensions to save their transaction-related backup in
right time.
Alexander Solovyov <alexander@solovyov.net> [Sun, 01 May 2011 12:29:32 +0200] rev 14265
add positional arguments to non-shell aliases
Idan Kamara <idankk86@gmail.com> [Sat, 07 May 2011 21:01:15 +0300] rev 14264
run-tests: take the basepath when constructing the test temp dir
so it's possible to run tests that are outside the test/ dir
Idan Kamara <idankk86@gmail.com> [Sat, 07 May 2011 20:56:43 +0300] rev 14263
run-tests: compare absolute paths in _checkhglib
Adrian Buehlmann <adrian@cadifra.com> [Sat, 07 May 2011 22:25:20 +0200] rev 14262
util: rename _windows_reserved_filenames and _windows_reserved_chars
Adrian Buehlmann <adrian@cadifra.com> [Sat, 07 May 2011 20:22:32 +0200] rev 14261
opener: rename _can_symlink to _cansymlink
Patrick Mezard <pmezard@gmail.com> [Sun, 08 May 2011 17:48:31 +0200] rev 14260
patch: make patch()/internalpatch() always update the dirstate
Patrick Mezard <pmezard@gmail.com> [Sun, 08 May 2011 17:48:30 +0200] rev 14259
patch: move updatedir() from cmdutil into patch
Also, create an artificial wdutil.py to avoid import cycles between patch.py
and cmdutil.py.
Patrick Mezard <pmezard@gmail.com> [Sun, 08 May 2011 17:48:29 +0200] rev 14258
record: unconditionally update the working dir after patching
Patrick Mezard <pmezard@gmail.com> [Sun, 08 May 2011 17:48:29 +0200] rev 14257
mq: explicitly updatedir() even if patch() fails
It already works that way in practice, and we intend to merge updatedir() into
patch().
Idan Kamara <idankk86@gmail.com> [Fri, 06 May 2011 19:55:46 +0300] rev 14256
mq: allow to qpop/push with a dirty working copy (issue2780)
It's safe to do so if the sets of changed files in the
working copy and patches are disjoint.
Idan Kamara <idankk86@gmail.com> [Fri, 06 May 2011 19:03:41 +0300] rev 14255
patch: introduce changedfiles
returns the set of all changed files in a given patch
Sune Foldager <cryo@cyanite.org> [Sat, 07 May 2011 23:14:36 +0200] rev 14254
debugindex: change output for generaldelta revlogs
For generaldelta revlogs, reporting the deltaparent instead of the chain base
makes more sense, since that's what's actually stored in the revlog.
Sune Foldager <cryo@cyanite.org> [Sat, 07 May 2011 22:40:17 +0200] rev 14253
revlog: support reading generaldelta revlogs
Generaldelta is a new revlog global flag. When it's turned on, the base field
of each revision entry holds the deltaparent instead of the base revision of
the current delta chain.
This allows for great potential flexibility when generating deltas, as any
revision can serve as deltaparent. Previously, the deltaparent for revision r
was hardcoded to be r - 1.
The base revision of the delta chain can still be accessed as before, since it
is now computed in an iterative fashion, following the deltaparents backwards.
Sune Foldager <cryo@cyanite.org> [Sat, 07 May 2011 22:40:14 +0200] rev 14252
revlog: calculate base revisions iteratively
This is in preparation for generaldelta, where the revlog entry base field is
reinterpreted as the deltaparent. For that reason we also rename the base
function to chainbase.
Without generaldelta, performance is unaffected, but generaldelta will suffer
from this in _addrevision, since delta chains will be walked repeatedly.
A cache has been added to eliminate this problem completely.
Sune Foldager <cryo@cyanite.org> [Sat, 07 May 2011 22:37:40 +0200] rev 14251
revlog: remove the last bits of punched/shallow
Most of it was removed in e7483ec3c374, but a few pieces were accidentally
left behind.
Patrick Mezard <pmezard@gmail.com> [Sat, 07 May 2011 21:12:35 +0200] rev 14250
util: make readfile() operate in binary mode
writefile() and appendfile() are already working that way.
Patrick Mezard <pmezard@gmail.com> [Sat, 07 May 2011 21:12:33 +0200] rev 14249
cmdutil: normalize log message eols when reading from file
This will be necessary once util.readfile() operates in binary mode. While
changelog.add() already normalizes the message, doing so in logmessage() is
required as ui.edit() or others expect messages with LF only.
Patrick Mezard <pmezard@gmail.com> [Sat, 07 May 2011 21:12:30 +0200] rev 14248
match: make 'listfile:' split on LF and CRLF
We want util.readfile() to operate in binary mode, so EOLs have to be handled
correctly depending on the platform. It seems both easier and more convenient
to treat LF and CRLF the same way on all platforms.
Patrick Mezard <pmezard@gmail.com> [Sat, 07 May 2011 17:25:12 +0200] rev 14247
progress: remove useless statement left by bab267e7fc1a
Patrick Mezard <pmezard@gmail.com> [Sat, 07 May 2011 17:25:02 +0200] rev 14246
debugbuilddag: simplify tags serialization a bit
Augie Fackler <durin42@gmail.com> [Mon, 02 May 2011 12:10:50 -0500] rev 14245
httprepo: send 100-continue on POSTs if using http2
Augie Fackler <durin42@gmail.com> [Fri, 06 May 2011 10:22:08 -0500] rev 14244
url: use new http support if requested by the user
The new http library is wired in via an extra module
(httpconnection.py), as it requires similar but different plumbing to
connect the library to Mercurial's internals and urllib2. Eventualy we
should be able to remove all of keepalive.py and its associated tangle
in url.py and replace it all with the code in httpconnection.py.
To use the new library, set 'ui.usehttp2' to true. The underlying http
library uses the logging module liberally, so if things break you can
use 'ui.http2debuglevel' to set the log level to INFO or DEBUG to get
that logging information (for example, ui.http2debuglevel=info.)
Augie Fackler <durin42@gmail.com> [Fri, 06 May 2011 09:57:55 -0500] rev 14243
Import new http library as mercurial.httpclient.
This is revision a4229f13c374 of
http://py-nonblocking-http.googlecode.com/ with a no-check-code
comment added to the end of each file using `for fi in $(hg manifest |
grep mercurial/httpclient/) ; echo '# no-check-code' >> $fi`.
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 06 May 2011 15:48:04 -0300] rev 14242
commands, i18n: add translation hint for split message
Idan Kamara <idankk86@gmail.com> [Fri, 06 May 2011 19:03:45 +0300] rev 14241
mq: don't hide the patch module
Idan Kamara <idankk86@gmail.com> [Fri, 06 May 2011 18:45:12 +0300] rev 14240
patch: remove unused ui arg to iterhunks
Idan Kamara <idankk86@gmail.com> [Fri, 06 May 2011 18:45:12 +0300] rev 14239
mq: loosen except clause when reading patch headers
Matt Mackall <mpm@selenic.com> [Fri, 06 May 2011 13:04:24 -0500] rev 14238
merge with abuehl
Adrian Buehlmann <adrian@cadifra.com> [Fri, 06 May 2011 15:41:04 +0200] rev 14237
rename util.set_signal_handler to setsignalhandler
Adrian Buehlmann <adrian@cadifra.com> [Fri, 06 May 2011 15:36:05 +0200] rev 14236
rename util.executable_path to executablepath
Adrian Buehlmann <adrian@cadifra.com> [Fri, 06 May 2011 15:34:34 +0200] rev 14235
rename util.os_link to oslink
Adrian Buehlmann <adrian@cadifra.com> [Fri, 06 May 2011 15:31:09 +0200] rev 14234
rename explain_exit to explainexit
Adrian Buehlmann <adrian@cadifra.com> [Fri, 06 May 2011 15:25:35 +0200] rev 14233
rename util.set_binary to setbinary
Adrian Buehlmann <adrian@cadifra.com> [Fri, 06 May 2011 15:22:31 +0200] rev 14232
rename util.set_flags to setflags
Adrian Buehlmann <adrian@cadifra.com> [Fri, 06 May 2011 15:19:48 +0200] rev 14231
rename util.parse_patch_output to parsepatchoutput
Adrian Buehlmann <adrian@cadifra.com> [Fri, 06 May 2011 15:16:22 +0200] rev 14230
rename util.lookup_reg to lookupreg
Adrian Buehlmann <adrian@cadifra.com> [Fri, 06 May 2011 15:13:46 +0200] rev 14229
rename util.set_hgexecutable to _sethgexecutable
Adrian Buehlmann <adrian@cadifra.com> [Fri, 06 May 2011 15:10:29 +0200] rev 14228
rename util.main_is_frozen to mainfrozen
Adrian Buehlmann <adrian@cadifra.com> [Fri, 06 May 2011 15:02:53 +0200] rev 14227
scmutil: rename local function _add_dir_if_not_there
Adrian Buehlmann <adrian@cadifra.com> [Fri, 06 May 2011 14:58:04 +0200] rev 14226
rename scmutil.user_rcpath to userrcpath
Adrian Buehlmann <adrian@cadifra.com> [Fri, 06 May 2011 14:54:05 +0200] rev 14225
rename scmutil.system_rcpath to systemrcpath
Adrian Buehlmann <adrian@cadifra.com> [Fri, 06 May 2011 14:52:25 +0200] rev 14224
rename scmutil.os_rcpath to osrcpath
Matt Mackall <mpm@selenic.com> [Fri, 06 May 2011 11:51:18 -0500] rev 14223
merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 06 May 2011 11:50:58 -0500] rev 14222
merge with crew
Martin Geisler <mg@aragost.com> [Fri, 06 May 2011 14:29:53 +0200] rev 14221
merge with stable
The change from 7b627923739f (parent 2) is not needed after switching
to the new url parser.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 06 May 2011 09:54:06 +0200] rev 14220
rename path_auditor to pathauditor
The Mercurial 1.9 release is moving a lot of stuff around anyway and we are
already moving path_auditor from util.py to scmutil.py for that release.
So this seems like a good opportunity to do such a rename. It also strengthens
the current project policy to avoid underbars in names.
Martin Geisler <mg@aragost.com> [Fri, 06 May 2011 12:09:20 +0200] rev 14219
revlog: use real Booleans instead of 0/1 in nodesbetween
Martin Geisler <mg@aragost.com> [Fri, 06 May 2011 11:31:40 +0200] rev 14218
patch: fix clash between local variable and exception instance
The local err variable would be bound to PatchError thrown and it
keeps this value even after the except block is executed.
The whole thing worked anyway since the rejected variable is set in
the except block and this makes the function return -1 when a
PatchError is thrown.
Martin Geisler <mg@aragost.com> [Fri, 06 May 2011 11:12:55 +0200] rev 14217
patchfile: use real Booleans instead of 0/1
Martin Geisler <mg@aragost.com> [Fri, 06 May 2011 11:11:55 +0200] rev 14216
annotate: use real Booleans instead of 0/1
Martin Geisler <mg@aragost.com> [Fri, 06 May 2011 10:02:46 +0200] rev 14215
hbisect: use real Booleans instead of 0/1
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Fri, 06 May 2011 14:45:13 +0200] rev 14214
summary: run discovery only once for in/out against same repo
Reuses the result of findcommonincoming if default and default-push
are the same.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Fri, 06 May 2011 14:44:18 +0200] rev 14213
discovery: resurrect findoutgoing as findcommonoutgoing for extension hooks
discovery.findoutgoing used to be a useful hook for extensions like
hgsubversion. This patch reintroduces this version of findcommonincoming
which is meant to be used when computing outgoing changesets.
Idan Kamara <idankk86@gmail.com> [Fri, 06 May 2011 16:00:48 +0300] rev 14212
transplant: remove unneeded loop over repo in revset
Idan Kamara <idankk86@gmail.com> [Fri, 06 May 2011 15:37:38 +0300] rev 14211
transplant: fix revset doc
Idan Kamara <idankk86@gmail.com> [Fri, 06 May 2011 16:07:35 +0300] rev 14210
mq: add a 'mq()' revset predicate that returns applied mq csets
Augie Fackler <durin42@gmail.com> [Fri, 06 May 2011 10:17:07 -0500] rev 14209
pyflakes: ignore files marked no-check-code
Sune Foldager <cryo@cyanite.org> [Thu, 05 May 2011 18:05:24 +0200] rev 14208
revlog: compute correct deltaparent in the deltaparent function
It now returns nullrev for chain base revisions, since they are conceptually
deltas against nullrev. The revdiff function was updated accordingly.
Zachary Gramana <zgramana@pottsconsultinggroup.com> [Thu, 05 May 2011 11:33:02 -0400] rev 14207
changelog: fixes leaked file handle
Steven Brown <StevenGBrown@gmail.com> [Thu, 05 May 2011 23:21:37 +0800] rev 14206
setdiscovery: limit lines to 80 characters
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 05 May 2011 16:01:09 +0200] rev 14205
subrepo: use code from 71ea5b2b9517 only if Python needs it (issue2795)
With Python >= 2.6 the original code already works correct, therefore the
fix for issue2556 on Python <= 2.5 broke relative subrepositories with
newer versions of Python.
Augie Fackler <durin42@gmail.com> [Wed, 04 May 2011 22:08:55 -0500] rev 14204
sslutil: extracted ssl methods from httpsconnection in url.py
This makes it easier to share ssl cert validation with other http
implementations.
Mads Kiilerich <mads@kiilerich.com> [Fri, 06 May 2011 00:34:10 +0200] rev 14203
check-code: fix checking for sh style in .t tests
Restore checks after they were disabled by 64de9ca66511.
Martin Geisler <mg@lazybytes.net> [Thu, 05 May 2011 20:04:49 +0200] rev 14202
run-tests: add --shell command line flag
This makes it easy to test with, say, both /bin/bash and /bin/dash
instead of changing the system-wide /bin/sh.
Martin Geisler <mg@lazybytes.net> [Thu, 05 May 2011 20:03:43 +0200] rev 14201
run-tests: use type of default to convert environment variable
Before, defaults could only be integers, they can now also be strings,
floats and what have you.
Martin Geisler <mg@lazybytes.net> [Thu, 05 May 2011 19:29:02 +0200] rev 14200
test-treediscovery: fix escaping for both dash and bash
A '\n' on the command line is turned into a newline by dash, but kept
as-is by bash, which resulted in a syntax error in the config file.
Luckily, dash wont turn '\n' into a newline when it is part of a
here-doc, so we can write the config file using that technique.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Thu, 05 May 2011 12:53:33 +0200] rev 14199
treediscovery: fix regression when run against older repos (issue2793)
I ran the entire test suite with "known" and "getbundle" disabled in
localrepository. This generated failures because the old findoutgoing
had always queried remote's heads explicitly and thus always got them
back in the returned heads. treediscovery.findcommonincoming now
correctly returns remote's heads in all cases.
Also adds a dedicated test for running treediscovery against a
pre-getbundle HTTP server.
Martin Geisler <mg@aragost.com> [Thu, 05 May 2011 14:57:21 +0200] rev 14198
commands: use util.Abort's hint some more
Martin Geisler <mg@aragost.com> [Thu, 05 May 2011 12:16:43 +0200] rev 14197
commands: use double-quotes for strings with single-quotes
The globalopts table contain a couple of \' still, but it was
normalized like that in 83238c1db6de.
Sune Foldager <cryo@cyanite.org> [Thu, 05 May 2011 12:46:02 +0200] rev 14196
revlog: remove support for punched/shallow
The feature was never finished, and there has been restructuring going on
since it was added.
Sune Foldager <cryo@cyanite.org> [Thu, 05 May 2011 12:55:12 +0200] rev 14195
revlog: remove support for parentdelta
We will introduce a more powerful and general delta concept instead,
called generaldelta.
Adrian Buehlmann <adrian@cadifra.com> [Wed, 04 May 2011 12:58:59 +0200] rev 14194
store: break up reference cycle introduced in 9cbff8a39a2a
see also 996c1cd8f530
Augie Fackler <durin42@gmail.com> [Wed, 04 May 2011 10:32:08 -0500] rev 14193
test-https.t: clean up superfluous trailing whitespace
Augie Fackler <durin42@gmail.com> [Wed, 04 May 2011 10:39:10 -0500] rev 14192
run-tests.py: correctly handle list options with parallel tasks
Idan Kamara <idankk86@gmail.com> [Wed, 04 May 2011 23:12:23 +0300] rev 14191
mq: don't suggest to refresh when qpushing with no applied patches
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 04 May 2011 20:14:30 +0200] rev 14190
bundlerepo: fix closing and docstring of getremotechanges
I did not in fact implement what I documented about closing of the
original repo. And there was a bit of leftover from an older version
of the API.
Kevin Bullock <kbullock@ringworld.org> [Wed, 04 May 2011 10:43:47 -0500] rev 14189
bookmarks: allow deactivating current bookmark with -i
Kevin Bullock <kbullock@ringworld.org> [Sat, 11 Dec 2010 18:08:55 +0100] rev 14188
bookmarks: allow to create/move bookmark without making it current (issue2788)
Adds a -i/--inactive flag to the bookmarks command to create or move a
bookmark without making it the current one. This lets you use a bookmark
like a shareable, movable 'tag' and less like a 'branch'.
Thanks to Alexander Solovyov <alexander@solovyov.net> for most of the
work of implementation, and Matt Mackall <mpm@selenic.com> for
suggesting the option name.
Mads Kiilerich <mads@kiilerich.com> [Thu, 05 May 2011 01:57:13 +0200] rev 14187
tests: test subrepos with ssh urls
Mads Kiilerich <mads@kiilerich.com> [Thu, 05 May 2011 01:47:46 +0200] rev 14186
tests: share dummyssh
Mads Kiilerich <mads@kiilerich.com> [Thu, 05 May 2011 01:47:46 +0200] rev 14185
tests: fix test-ssh.t after 6bd9778ae749
Sune Foldager <cryo@cyanite.org> [Wed, 04 May 2011 19:27:55 +0200] rev 14184
fix errors reported by pyflakes test
Matt Mackall <mpm@selenic.com> [Wed, 04 May 2011 08:21:50 -0500] rev 14183
merge with crew
Sune Foldager <cryo@cyanite.org> [Wed, 04 May 2011 13:37:41 +0200] rev 14182
tests: fix deprecated use of hg debugdata/debugindex
For filelogs, debugindex and debugdata can be called with the file name
directly instead of the path to the revlog. Since in the future filelogs
will no longer be valid revlogs, calling with a path to the revlog is
deprecated for debugdata. For debugindex it is expected to still work,
but I changed them as well for consistency.
Matt Mackall <mpm@selenic.com> [Tue, 03 May 2011 22:04:23 -0500] rev 14181
merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 03 May 2011 22:04:11 -0500] rev 14180
merge with crew
Matt Mackall <mpm@selenic.com> [Tue, 03 May 2011 21:53:13 -0500] rev 14179
hgext: fixup a couple missed file().read() instances
Adrian Buehlmann <adrian@cadifra.com> [Tue, 03 May 2011 22:11:56 +0200] rev 14178
test-casecollision.t: add test for case changing rename
timeless <timeless@mozdev.org> [Sun, 01 May 2011 18:57:11 +0200] rev 14177
convert: fix error in git solaris code
timeless <timeless@mozdev.org> [Sun, 01 May 2011 17:36:16 +0200] rev 14176
test: add pyflakes checking for unable to detect undefined names
timeless <timeless@mozdev.org> [Sun, 01 May 2011 17:27:41 +0200] rev 14175
tests: add pyflakes checking for assigned to but never used
timeless <timeless@mozdev.org> [Sun, 01 May 2011 17:20:40 +0200] rev 14174
remove unused variables
timeless <timeless@mozdev.org> [Sun, 01 May 2011 18:56:27 +0200] rev 14173
test-pyflake: improve sorting algorithm
Johan Euphrosine <proppy@google.com> [Mon, 02 May 2011 09:50:21 +0200] rev 14172
add make check: tests rule
Sune Foldager <cryo@cyanite.org> [Tue, 03 May 2011 22:28:08 +0200] rev 14171
ui: add configint function and tests
Kevin Bullock <kbullock@ringworld.org> [Tue, 03 May 2011 11:46:02 -0500] rev 14170
mq: strip extra whitespace from node ids in header (issue2790)
This makes `hg qpush --exact` work with patches created by `hg export`.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Mon, 02 May 2011 10:11:24 +0200] rev 14169
check-code: disallow calling opener(...).read() and opener(..).write()
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Mon, 02 May 2011 10:11:18 +0200] rev 14168
prevent transient leaks of file handle by using new helper functions
These leaks may occur in environments that don't employ a reference
counting GC, i.e. PyPy.
This implies:
- changing opener(...).read() calls to opener.read(...)
- changing opener(...).write() calls to opener.write(...)
- changing open(...).read(...) to util.readfile(...)
- changing open(...).write(...) to util.writefile(...)
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Mon, 02 May 2011 10:11:05 +0200] rev 14167
util & scmutil: adapt read/write helpers as request by mpm
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Mon, 02 May 2011 09:11:35 +0200] rev 14166
store: use a subclass, not a function for fncacheopener
jfh <jason@jasonfharris.com> [Mon, 18 Apr 2011 02:42:52 +0200] rev 14165
util.termwidth: never return 0 for terminal width
Catch a case where the termwidth was being reported as 0 when I was connecting
with TLMTask instead of NSTask in OSX. This caused the progress extension to
print no progress. The termwidth should never return 0 so in case we would
return 0, simply fall back to the default termwidth below which is 80.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 02 May 2011 19:21:30 +0200] rev 14164
discovery: add new set-based discovery
Adds a new discovery method based on repeatedly sampling the still
undecided subset of the local node graph to determine the set of nodes
common to both the client and the server.
For small differences between client and server, it uses about the same
or slightly fewer roundtrips than the old tree-based discovery. For
larger differences, it typically reduces the number of roundtrips
drastically (from 150 to 4, for instance).
The old discovery code now lives in treediscovery.py, the new code is
in setdiscovery.py.
Still missing is a hook for extensions to contribute nodes to the
initial sample. For instance, Augie's remotebranches could contribute
the last known state of the server's heads.
Credits for the actual sampler and computing common heads instead of
bases go to Benoit Boissinot.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 02 May 2011 19:21:30 +0200] rev 14163
debugbuilddag: use memctx for speed
This drops the options to run arbitrary shell commands within
commits and the option to create a file that gets appended to
in every revision. It now supports to not write file data at
all, which is very fast for generating a pure 00changelog.i
(useful for discovery tests, for instance).
Timings for 1000 linear nodes:
* Old `hg debugbuilddag -o '+1000'` took 4.5 secs.
* New `hg debugbuilddag -o '+1000'` takes 2 secs.
* New `hg debugbuilddag '+1000'` takes 0.8 secs.
(The last one creates only 00changelog.i).
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 02 May 2011 19:20:29 +0200] rev 14162
localrepo: reuse parent manifest in commitctx if no files have changed
This speeds up the in-memory version of debugbuilddag that I'm
working on considerably for the case where we want to build just
a 00changelog.i (for discovery tests, for instance).
There are a couple of test changes because node ids in tests
have changed.
The changes to the patch names in test-mq-qdelete.t were required
because they could collide with nodeid abbreviations and newly
actually do (patch "c" collides with id "cafe..." for patch "b").
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 02 May 2011 12:36:23 +0200] rev 14161
bundlerepo: fix and improve getremotechanges
Fixes the regression where incoming could show local changes
introduced by rev 72c84f24b420.
Adrian Buehlmann <adrian@cadifra.com> [Mon, 02 May 2011 00:04:49 +0200] rev 14160
hgrc.5: mention new 'case collision' handling for ui.portablefilenames
Pascal Quantin <pascal.quantin@gmail.com> [Sun, 01 May 2011 20:29:44 +0200] rev 14159
win32: remove obsolete bookmarks and parentrevspec extensions from mercurial.ini
Matt Mackall <mpm@selenic.com> [Sun, 01 May 2011 13:08:29 -0500] rev 14158
bundlerepo: drop struct
Yuya Nishihara <yuya@tcha.org> [Mon, 02 May 2011 01:29:51 +0900] rev 14157
bisect: fix indent level
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sun, 01 May 2011 18:43:20 +0200] rev 14156
share: create 'hgrc' using an opener, like clone
Mads Kiilerich <mads@kiilerich.com> [Sun, 01 May 2011 19:51:28 +0200] rev 14155
backout 3a3584967a93 - the "unreachable code" was apparently not unreachable
All tests repeatedly passes with 3a3584967a93 on some machines, but on other
machines it regularly causes failure in test-mv-cp-st-diff.t, such as:
@@ -203,6 +203,7 @@
- working to root: --rev 0
M a
+ M x/x
A b
a
Sune Foldager <cryo@cyanite.org> [Sun, 01 May 2011 19:44:28 +0200] rev 14154
merge with mpm
Mads Kiilerich <mads@kiilerich.com> [Sun, 01 May 2011 17:35:05 +0200] rev 14153
revset: avoid over-aggresive optimizations of non-filtering functions (issue2549)
When limit, last, min and max were evaluated they worked on a reduced set in the
wrong way. Now they work on an unrestricted set (the whole repo) and get
limited later on.
Mads Kiilerich <mads@kiilerich.com> [Sun, 01 May 2011 17:35:05 +0200] rev 14152
convert: handle invalid subversion source paths
Mads Kiilerich <mads@kiilerich.com> [Sun, 01 May 2011 17:34:16 +0200] rev 14151
convert: also catch missing revlogs when introduced in repo roots
The previous behaviour was almost as if convert.hg.ignoreerrors was always set
for revisions without parents, except that errors were silently ignored. Revlog
errors are handled as a side effect of getcopies(), but getcopies() was only
called when convert.hg.ignoreerrors was set.
Now we always call self.getcopies for root revisions, not only when
convert.hg.ignoreerrors is set, just like we do on all other revisions.
The extra call might be a bit expensive, but the proper fix for that would be
to catch these errors in another way.
Mads Kiilerich <mads@kiilerich.com> [Thu, 24 Feb 2011 14:06:08 +0100] rev 14150
status: remove unreachable code for status between revisions
The manifest value of a file will never be false when "not parentworking", and
the expensive content comparision would thus fortunately never be reached. (If
it was reached it would be wrong for example in case of renames.)
This code once handled status against working directory, but that has been done
elsewhere for a long time.
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Mar 2011 14:47:30 +0100] rev 14149
httprepo: proper handling of invalid responses without content-type (issue2019)
This can currently be tested on http://sf.net/
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Mar 2011 22:50:55 +0100] rev 14148
httprepo: use the original exception after falling back to static-http failed
Before the fine exception handling in httprepo was never shown.
The static-http exception will now only be shown when static-http is requested
explicitly.
Mads Kiilerich <mads@kiilerich.com> [Sun, 01 May 2011 15:49:13 +0200] rev 14147
test: test that backslash is preserved by the url class
Mads Kiilerich <mads@kiilerich.com> [Sun, 01 May 2011 15:49:13 +0200] rev 14146
tests: use raw string for url tests of '\' handling
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sun, 01 May 2011 16:54:48 +0200] rev 14145
color: fix using multiple effects
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 30 Apr 2011 19:01:24 +0200] rev 14144
unbundler: separate delta and header parsing
Add header parsing for changelog and manifest (currently no headers might
change for next-gen bundle).
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 30 Apr 2011 11:03:28 +0200] rev 14143
changegroup: new bundler API
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 30 Apr 2011 10:41:06 +0200] rev 14142
bundlerepo: port to new bundle API
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 30 Apr 2011 10:00:41 +0200] rev 14141
bundler: make parsechunk return the base revision of the delta
timeless <timeless@mozdev.org> [Sun, 01 May 2011 15:22:30 +0200] rev 14140
tests: add pyflakes checking for unused imports
timeless <timeless@mozdev.org> [Sun, 01 May 2011 15:21:57 +0200] rev 14139
remove unused imports
Adrian Buehlmann <adrian@cadifra.com> [Sat, 30 Apr 2011 23:27:00 +0200] rev 14138
scmutil: introduce casecollisionauditor
and cleaning up portability functions
timeless <timeless@mozdev.org> [Sun, 01 May 2011 16:11:42 +0200] rev 14137
check-code: check for repo in revlog and ui in util
timeless <timeless@mozdev.org> [Sun, 01 May 2011 16:10:51 +0200] rev 14136
check-code: allow for checking multiple pattern sets per file
timeless <timeless@mozdev.org> [Sun, 01 May 2011 15:55:00 +0200] rev 14135
check-code: adding debug flag
Augie Fackler <durin42@gmail.com> [Sun, 01 May 2011 08:00:25 -0500] rev 14134
run-tests: add flag to provide extra hgrc options for test runs
Patrick Mezard <pmezard@gmail.com> [Sun, 01 May 2011 15:51:52 +0200] rev 14133
graphlog: always sort revisions topologically
The grapher cannot really handled revisions if they are not emitted in
topological order. The previous 'reverse()' revset was not enough to achieve
that and was replaced by an explicit sort call for simplicity. The --limit
option is now also handled as usual with cmdutil.loglimit() instead of a
'limit' revset.
Patrick Mezard <pmezard@gmail.com> [Sun, 01 May 2011 15:51:48 +0200] rev 14132
graphlog: take the union of --rev specs instead of the intersection
Patrick Mezard <pmezard@gmail.com> [Sun, 01 May 2011 15:51:46 +0200] rev 14131
graphmod: correctly emit nodes with more than 2 predecessors
The grandparent() function was returning only the closest predecessor of a
missing parent while it must return all of them to display a correct ancestry
graph.
Patrick Mezard <pmezard@gmail.com> [Sun, 01 May 2011 15:51:20 +0200] rev 14130
graphlog: display nodes with more than 2 predecessors
While nodes with more than 2 parents do not exist in revision graphs, they do
appear when you transform them by removing subgraphs while trying to preserve
ancestry links.
This code was borrowed from Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
pbranch extension.
Matt Mackall <mpm@selenic.com> [Sun, 01 May 2011 08:29:50 -0500] rev 14129
context: provide an efficient iterator for workingctx
This avoids needing to call status or build a synthetic manifest.
Matt Mackall <mpm@selenic.com> [Sun, 01 May 2011 06:06:59 -0500] rev 14128
merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 01 May 2011 06:04:08 -0500] rev 14127
merge with nicdumz
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 01 May 2011 10:51:10 +0200] rev 14126
tests: export patches only once in test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 18:31:28 +0200] rev 14125
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 17:38:06 +0200] rev 14124
tests: move rebase-keep-branch into rebase-named-branches
It's not worth building a repository just to test keep branch
when we can do it our bigger, other, already built repositories.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 17:38:06 +0200] rev 14123
tests: move testcase from rebase-named-branches to rebase-parameters
It saves us a clone of a repository.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 17:38:06 +0200] rev 14122
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 17:38:06 +0200] rev 14121
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 17:38:06 +0200] rev 14120
tests: simplify test-rebase-named-branches
We were cloning a repo to perform a smoke test that could
have been performed earlier.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 17:38:06 +0200] rev 14119
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Add two changesets to the scenario so that the bundle can be reused
within three tests.
Before:
@ 5: 'F'
|
| o 4: 'E'
|/|
o | 3: 'D
| |
| o 2: 'C'
|/
| o 1: 'B'
|/
o 0: 'A'
After:
@ 7: 'H'
|
| o 6: 'G'
|/|
o | 5: 'F'
| |
| o 4: 'E'
|/
| o 3: 'D'
| |
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
Revisions 0-1 keep the same number/label. Others were translated by
an offset of 2 (2.C -> 4.E)
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 17:38:06 +0200] rev 14118
tests: introduce a rebase bundle to use with rebase tests
Allows saving a few seconds in test runs by not constructing
over and over the same repository.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 17:38:06 +0200] rev 14117
tests: create a bundle to bootstrap tests using a remote repository
It should be faster to use a single common bundle instead of
recreating 4 times the same repository manually.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 17:38:06 +0200] rev 14116
tests: move test bundles in a bundles/ subdirectory
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 17:38:06 +0200] rev 14115
tests: move test-issue436 in test-dispatch where fancyopts is tested
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 17:38:06 +0200] rev 14114
tests: remove test-issue433 as it's covered by test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 17:38:06 +0200] rev 14113
tests: remove executable bits from unified tests
Those files are not executable.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 17:38:06 +0200] rev 14112
tests: remove test-issue322 as it's fully included in test-issue660
Matt Mackall <mpm@selenic.com> [Sun, 01 May 2011 05:58:04 -0500] rev 14111
Added signature for changeset 3cb1e95676ad
Matt Mackall <mpm@selenic.com> [Sun, 01 May 2011 05:57:59 -0500] rev 14110
Added tag 1.8.3 for changeset 3cb1e95676ad
Matt Mackall <mpm@selenic.com> [Sun, 01 May 2011 05:53:28 -0500] rev 14109
merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 29 Apr 2011 18:19:08 -0300] rev 14108
i18n-pt_BR: synchronized with 42d5165975ad
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 29 Apr 2011 18:12:55 -0300] rev 14107
merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 29 Apr 2011 18:11:54 -0300] rev 14106
i18n-pt_BR: minor spacing fix
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 25 Apr 2011 14:18:19 -0300] rev 14105
i18n-pt_BR: synchronized with 3c753f9a2fbc
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 19:36:59 +0200] rev 14104
zeroconf: notify the Zeroconf threads when hg exits
Zeroconf launches two threads in the background, and they wait on
Condition objects to exit. We need to call Zeroconf.close() to
release those conditions so that threads can gracefully exit.
This means that an interrupt on the hg process will now gracefully
propagate to the Zeroconf children, fixing that bug which did not
allow us to kill an `hg serve` process.
Brodie Rao <brodie@bitheap.org> [Sun, 01 May 2011 12:14:22 +0200] rev 14103
color: use ui.formatted() to test TTYness, not sys.stdout.isatty()
This fixes the color extension not working with pager (broken in
877390020477). The pager extension already sets ui.formatted=True to
allow this use case.
Brodie Rao <brodie@bitheap.org> [Sun, 01 May 2011 11:12:36 +0200] rev 14102
pushkey: add hooks for pushkey/listkeys
Augie Fackler <durin42@gmail.com> [Sat, 30 Apr 2011 12:02:09 -0500] rev 14101
test-patchbomb.t: clean up progress tests
Matt Mackall <mpm@selenic.com> [Sun, 01 May 2011 04:56:24 -0500] rev 14100
util: really drop size from readfile
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sun, 01 May 2011 11:46:49 +0200] rev 14099
util: add readfile() & writefile() helper functions
These two functions allow quickly reading or writing a file, without
relying on reference counting to close the file handle afterwards.
Alexander Solovyov <alexander@solovyov.net> [Sat, 30 Apr 2011 18:30:14 +0200] rev 14098
revset aliases
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sat, 30 Apr 2011 19:41:53 +0200] rev 14097
opener: add read & write utility methods
The two new methods are useful for quickly opening a file for reading
or writing. Unlike 'opener(...).read()', they ensure they the file is
immediately closed without relying on CPython reference counting.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sun, 01 May 2011 11:01:57 +0200] rev 14096
dispatch: handle IndexErrors
Augie Fackler <durin42@gmail.com> [Sat, 30 Apr 2011 11:18:43 -0500] rev 14095
color: verify stdout is a tty before using curses
Without this change, curses complains when invoked in certain contexts
because stdout isn't a tty (such as emacs integration) but we ask it
to check for various bits of information from terminfo.
Matt Mackall <mpm@selenic.com> [Sun, 01 May 2011 03:51:04 -0500] rev 14094
http: minor tweaks to long arg handling
x-arg -> x-hgarg
replace itertools.count(1)
Steven Brown <StevenGBrown@gmail.com> [Sun, 01 May 2011 01:04:37 +0800] rev 14093
httprepo: long arguments support (issue2126)
Send the command arguments in the HTTP headers. The command is still part
of the URL. If the server does not have the 'httpheader' capability, the
client will send the command arguments in the URL as it did previously.
Web servers typically allow more data to be placed within the headers than
in the URL, so this approach will:
- Avoid HTTP errors due to using a URL that is too large.
- Allow Mercurial to implement a more efficient wire protocol.
An alternate approach is to send the arguments as part of the request body.
This approach has been rejected because it requires the use of POST
requests, so it would break any existing configuration that relies on the
request type for authentication or caching.
Extensibility:
- The header size is provided by the server, which makes it possible to
introduce an hgrc setting for it.
- The client ignores the capability value after the first comma, which
allows more information to be included in the future.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sat, 30 Apr 2011 19:36:48 +0200] rev 14092
store: rename the 'opener' argument to 'openertype'
The 'opener' argument wasn't, in fact, an actual opener instance, but
rather something expected to return an opener. The normal argument,
from localrepository, is the scmutil.opener type; hence 'openertype'.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sat, 30 Apr 2011 19:41:25 +0200] rev 14091
statichttprepo: make the opener a subclass of abstractopener
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sat, 30 Apr 2011 19:37:13 +0200] rev 14090
add filteropener abstraction for store openers
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sat, 30 Apr 2011 19:36:48 +0200] rev 14089
opener: introduce an abstact superclass of it
Currently, this class doesn't do anything useful.
Patrick Mezard <pmezard@gmail.com> [Sat, 30 Apr 2011 19:42:00 +0200] rev 14088
graphlog: use a set for inclusion test
This makes a big difference in performance in the special case where all
revisions are being graphed.
Idan Kamara <idankk86@gmail.com> [Sat, 30 Apr 2011 15:10:58 +0300] rev 14087
graphmod: restore generator nature of dagwalker
9966c95b8c4f introduced the ability to walk the DAG
given arbitrary revisions, but changed the behaviour of
it to return a list of all nodes (and create a changectx
for each one) rather than doing it lazily.
This has a pretty significant impact on performance for large
repositories (tested on CPython repo, with output disabled):
$ time hg glog
real 0m2.642s
user 0m2.560s
sys 0m0.080s
Before 9966c95b8c4f:
$ time hg glog
real 0m0.143s
user 0m0.112s
sys 0m0.032s
And after this fix:
$ time hg glog
real 0m0.213s
user 0m0.184s
sys 0m0.028s
Patrick Mezard <pmezard@gmail.com> [Sat, 30 Apr 2011 19:42:00 +0200] rev 14086
graphlog: log -G --follow file does not work, forbid it
We do not have revsets to follow file history.
Patrick Mezard <pmezard@gmail.com> [Sat, 30 Apr 2011 19:42:00 +0200] rev 14085
graphlog: unify log -G revset translation
Patrick Mezard <pmezard@gmail.com> [Sat, 30 Apr 2011 19:42:00 +0200] rev 14084
graphlog: fix log -G --prune
follow() revset really means '::.' while we want something based on the passed
argument. Also, ancestors() revset does not include the parent revisions.
Patrick Mezard <pmezard@gmail.com> [Sat, 30 Apr 2011 19:42:00 +0200] rev 14083
graphlog: escape log -G single value option arguments
Patrick Mezard <pmezard@gmail.com> [Sat, 30 Apr 2011 19:42:00 +0200] rev 14082
graphlog: fix log -G --removed
Current version was mispelled and processed like a valued argument.
Patrick Mezard <pmezard@gmail.com> [Sat, 30 Apr 2011 19:42:00 +0200] rev 14081
graphlog: fix log -G option types when translating to revset
For instance, --keyword is a multiple value option while it was processed as a
single value option.
Kevin Gessner <kevin@kevingessner.com> [Sat, 30 Apr 2011 18:53:56 +0200] rev 14080
revset: add tests for multiple and mixed ^ and ~ operators
Kevin Gessner <kevin@kevingessner.com> [Sat, 30 Apr 2011 18:27:39 +0200] rev 14079
extensions: obsolete and remove parentrevspec extension
As of 305c97670d7a, revsets implements the ^ and ~ operators that this
extension provides, so it's no longer necessary.
Steve Borho <steve@borho.org> [Sat, 30 Apr 2011 11:53:57 -0500] rev 14078
wix: a new mercurial.js has replaced graph.js
Brodie Rao <brodie@bitheap.org> [Sat, 30 Apr 2011 09:43:23 -0700] rev 14077
util.url: copy urllib.unquote() into util to improve startup times
The ui class uses util.hasscheme() in a couple of places, causing hg
to import urllib even when it doesn't need to. This copies
urllib.unquote() to avoid that import.
perfstartup time before the URL refactoring (8796fb6af67e):
! wall 0.050692 comb 0.000000 user 0.000000 sys 0.000000 (best of 100)
before this change:
! wall 0.064742 comb 0.000000 user 0.000000 sys 0.000000 (best of 100)
after this change:
! wall 0.052126 comb 0.000000 user 0.000000 sys 0.000000 (best of 100
Brodie Rao <brodie@bitheap.org> [Sat, 30 Apr 2011 09:43:20 -0700] rev 14076
url: move URL parsing functions into util to improve startup time
The introduction of the new URL parsing code has created a startup
time regression. This is mainly due to the use of url.hasscheme() in
the ui class. It ends up importing many libraries that the url module
requires.
This fix helps marginally, but if we can get rid of the urllib import
in the URL parser all together, startup time will go back to normal.
perfstartup time before the URL refactoring (8796fb6af67e):
! wall 0.050692 comb 0.000000 user 0.000000 sys 0.000000 (best of 100)
current startup time (139fb11210bb):
! wall 0.070685 comb 0.000000 user 0.000000 sys 0.000000 (best of 100)
after this change:
! wall 0.064667 comb 0.000000 user 0.000000 sys 0.000000 (best of 100)
Sune Foldager <cryo@cyanite.org> [Sat, 30 Apr 2011 16:33:47 +0200] rev 14075
revlog: introduce _chunkbase to allow filelog to override
Used by revlog.revision to retrieve the base-chunk in a delta chain.
Sune Foldager <cryo@cyanite.org> [Sat, 30 Apr 2011 16:32:50 +0200] rev 14074
filelog: extract metadata parsing and packing
_parsemeta returns the dictionary and a list of keys in the order they appear
in metadata. This can be used to repack the dictionary in the same order.
_packmeta creates metadata from a dictionary and an optional key-order list.
In _parsemeta, we use slices and re.search indead of str.index so we can accept
both buffers and strings.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Sat, 30 Apr 2011 17:21:37 +0200] rev 14073
discovery: drop findoutgoing and simplify findcommonincoming's api
This is a long desired cleanup and paves the way for new discovery.
To specify subsets for bundling changes, all code should use the heads
of the desired subset ("heads") and the heads of the common subset
("common") to be excluded from the bundled set. These can be used
revlog.findmissing instead of revlog.nodesbetween.
This fixes an actual bug exposed by the change in test-bundle-r.t
where we try to bundle a changeset while specifying that said changeset
is to be assumed already present in the target. This used to still
bundle the changeset. It no longer does. This is similar to the bugs
fixed by the recent switch to heads/common for incoming/pull.
Kevin Gessner <kevin@kevingessner.com> [Sat, 30 Apr 2011 18:25:45 +0200] rev 14072
revset: add missing whitespace
Brodie Rao <brodie@bitheap.org> [Sat, 30 Apr 2011 07:00:13 -0700] rev 14071
url: remove unused/obsolete functions
Kevin Gessner <kevin@kevingessner.com> [Sat, 30 Apr 2011 17:43:04 +0200] rev 14070
revset: add ^ and ~ operators from parentrevspec extension
^ (Nth parent) and ~ (Nth first ancestor) are infix operators that match
certain ancestors of the set:
set^0
the set
set^1 (also available as set^)
the first parent of every changeset in set
set^2
the second parent of every changeset in set
set~0
the set
set~1
the first ancestor (i.e. the first parent) of every changeset in set
set~2
the second ancestor (i.e. first parent of first parent) of every changeset
in set
set~N
the Nth ancestor (following first parents only) of every changeset in set;
set~N is equivalent to set^1^1..., with ^1 repeated N times.
Matt Mackall <mpm@selenic.com> [Sat, 30 Apr 2011 10:57:13 -0500] rev 14069
encoding: add an encoding-aware lower function
Kevin Gessner <kevin@kevingessner.com> [Sat, 30 Apr 2011 12:39:46 +0200] rev 14068
add: notify when adding a file that would cause a case-folding collision
On a case-sensitive file system, files can be added with names that differ
only in case (a "case collision"). This would cause an error on case-insensitive
filesystems. A warning or error is now given for such collisions, depending on
the value of ui.portablefilenames ('warn', 'abort', or 'ignore'):
$ touch file File
$ hg add --config ui.portablefilenames=abort File
abort: possible case-folding collision for File
$ hg add File
warning: possible case-folding collision for File
Kevin Gessner <kevin@kevingessner.com> [Sat, 30 Apr 2011 11:08:24 +0200] rev 14067
scmutil: refactor ui.portablefilenames processing
The ui.portablefilenames config handling is generally useful for notifying the
user of various portability problems.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sat, 30 Apr 2011 15:05:36 +0200] rev 14066
pure bdiff: don't use a generator
Generators are slow, and currently defeat the PyPy JIT.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sat, 30 Apr 2011 15:05:34 +0200] rev 14065
pure mpatch: avoid using list.insert(0, ...)
In Python lists are implemented as arrays with overallocation. As a
result, list.insert(0, ...) is O(n), whereas list.append() has an
amortised running time of O(1). Reversing the internal representation
of the list should cause a slight speedup for pure Python builds.
Alexander Solovyov <alexander@solovyov.net> [Sat, 30 Apr 2011 13:59:14 +0200] rev 14064
remove unused imports and variables
Augie Fackler <durin42@gmail.com> [Sat, 30 Apr 2011 07:30:38 -0500] rev 14063
Zeroconf: catch both ValueError and KeyError in get()
This prevents a traceback during discovery of available hosts.
Idan Kamara <idankk86@gmail.com> [Sat, 30 Apr 2011 15:20:27 +0300] rev 14062
run-tests: print a new line before writing the diff
Matt Mackall <mpm@selenic.com> [Sat, 30 Apr 2011 10:56:43 -0500] rev 14061
revsets: add a last function
last(set, n) = reverser(limit(reverse(set), n))
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 30 Apr 2011 14:22:03 +0200] rev 14060
bundle: more comments about the different header types, remove useless if
Martin Geisler <mg@lazybytes.net> [Sat, 30 Apr 2011 15:30:51 +0200] rev 14059
merge with mpm
Martin Geisler <mg@lazybytes.net> [Sat, 30 Apr 2011 13:47:22 +0200] rev 14058
hgweb: initialize permhooks at definition time
This is simpler than creating it empty and then appending the default
checkauthz hook 50 lines below.
Brodie Rao <brodie@bitheap.org> [Sat, 30 Apr 2011 06:58:22 -0700] rev 14057
revset: fix undefined name ParseError
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sat, 30 Apr 2011 12:56:28 +0200] rev 14056
branchcache: improve speed relative to the amount of heads
Updating the branch cache is quadratic to the amount of heads in the
repository. One consequence of this was that cloning a pathological
repository with 10,000 heads (and nothing else) took hours of CPU
time.
This patch makes one of the inner loop much faster, by removing a
changectx instantiation, and removes another entirely in cases where
there are no candidate branch heads which descend from other branch
heads.
Alexander Solovyov <alexander@solovyov.net> [Sat, 30 Apr 2011 12:55:07 +0200] rev 14055
drop {short,hex}(ctx.node()) calls in favor of ctx methods
Idan Kamara <idankk86@gmail.com> [Fri, 29 Apr 2011 22:21:13 +0300] rev 14054
mq: be more explicit on invalid patch name message
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 30 Apr 2011 11:16:52 +0200] rev 14053
fix broken tests
test-debugcomplete.t broken by 58e58406ed19
test-highlight.t broken by b24e5a708fad
Matt Mackall <mpm@selenic.com> [Sat, 30 Apr 2011 03:44:31 -0500] rev 14052
merge with stable
Idan Kamara <idankk86@gmail.com> [Fri, 29 Apr 2011 22:21:13 +0300] rev 14051
mq: add '.' and '..' to list of forbidden patch names
When an empty string is being passed to normname
it would return '.' causing checkfile() to always
return that a patch with that name exists.
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Mar 2011 14:00:49 +0100] rev 14050
subrepo: handle svn tracked/unknown directory collisions
This happens more often than expected. Say you have an svn subrepository with
python code. Python would have generated unknown .pyc files. Now, you rebase
this setup on a revision where a directory containing python code does not
exist. Subversion is first asked to remove this directory when updating, but
will not because it contains untracked items. Then it will have to bring back
the directory after the merge but will fail because it now collides with an
untracked directory.
Using --force is not very elegant and only works with svn >= 1.5 but the only
alternative I can think of is to write our own purge command for subversion.
Matt Mackall <mpm@selenic.com> [Sat, 30 Apr 2011 03:00:38 -0500] rev 14049
subrepo: backout bcc6ed0f6c3b
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Fri, 29 Apr 2011 14:54:01 +0200] rev 14048
wireproto: add test for new optional arg missing on server
New argument is silently ignored by both HTTP and SSH servers.
This means we can, for instance, add new flags to getbundle()
to request advanced features (like lightweight-copy-aware bundles),
and older servers will silently ignore this request and send back
a plain bundle.
Matt Mackall <mpm@selenic.com> [Sat, 30 Apr 2011 02:42:05 -0500] rev 14047
merge with stable
Benoit Allard <benoit@aeteurope.nl> [Thu, 28 Apr 2011 17:02:39 +0200] rev 14046
web: Made elapsed time calculation dynamic (javascript).
This allow safe caching of the pages by the browser and still display the right
amount of elapsed time upon page refresh.
If javascript is disabled, absolute time is displayed, leaving it readable.
All the templates have been updated.
Steven Stallion <sstallion@gmail.com> [Wed, 27 Apr 2011 21:55:46 -0400] rev 14045
extdiff: add repository root as a variable
Some external diff tools (notably Plan 9 diff(1)) require the absolute path
to the file being diffed for proper function. A root variable was added to
inform an external tool of the repository root (the tool is invoked with the
cwd set to tmproot).
Yun Lee <yun.lee.bj@gmail.com> [Sun, 17 Apr 2011 23:08:35 +0800] rev 14044
help: move hgignore man page into built-in help (issue2769)
Alexander Solovyov <alexander@solovyov.net> [Sat, 23 Apr 2011 15:04:15 +0200] rev 14043
graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net> [Sun, 13 Mar 2011 15:53:38 +0100] rev 14042
graphmod: use revsets internally
Thanks for the idea and most of the implementation to Klaus Koch
Backs revisions() and filerevs() with DAG walker which can iterate through
arbitrary list of revisions instead of strict one by one iteration from start to
stop. When a gap occurs in a revisions (i.e. in file log), the next topological
parent within the revset is searched and the connection to it is printed in the
ascii graph.
File graph can draw sometimes more connections than previous version, because
graph is produced according to the revset, not according to a file's filelog.
In case the graph contains several branches where the left parent is null, the
graphs for each are printed sequentially, not in parallel as it was a case
earlier (see for example the graph for README in hg-dev).
Augie Fackler <durin42@gmail.com> [Fri, 29 Apr 2011 03:34:18 -0500] rev 14041
svn subrepo: attempt work around obstructed checkouts (issue2752)
It should be possible to do better than this with 'svn switch', but
the logic required woud be significantly more complex. Until someone
needs the performance improvements of using switch, we'll just use the
same strategy for everything.
Alexander Solovyov <alexander@solovyov.net> [Fri, 29 Apr 2011 16:34:52 +0200] rev 14040
churn: strip key earlier to avoid false negative seach in aliases
Idan Kamara <idankk86@gmail.com> [Fri, 29 Apr 2011 18:43:36 +0300] rev 14039
bookmarks: further restrict IOError on write
This won't risk losing the undo file when the error
was something other than file not found
Idan Kamara <idankk86@gmail.com> [Fri, 29 Apr 2011 18:44:56 +0300] rev 14038
tags: loosen IOError filtering when reading localtags
Idan Kamara <idankk86@gmail.com> [Fri, 29 Apr 2011 20:29:22 +0300] rev 14037
run-tests: don't count test as succeeded if it failed
regressed around ec4ae5727f07
Adrian Buehlmann <adrian@cadifra.com> [Sun, 24 Apr 2011 20:11:05 +0200] rev 14036
changegroup: do not count closed new heads (issue2697)
If a closed head gets pulled, we currently see (example):
$ hg pull
pulling from $TESTTMP/repo2
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
A subsequent 'hg heads' doesn't show that head because it is closed.
This patch improves the UI response texts for that same use case to:
$ hg pull
pulling from $TESTTMP/repo2
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
That is, the part "(+1 heads)" is not shown in that case any longer.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 29 Apr 2011 20:02:46 +0200] rev 14035
merge with crew
Augie Fackler <durin42@gmail.com> [Fri, 29 Apr 2011 09:28:45 -0500] rev 14034
shrink-revlog: defend against null first parents
Augie Fackler <durin42@gmail.com> [Fri, 29 Apr 2011 12:46:56 -0500] rev 14033
test-contrib: add a test for shrink-revlog
We only verify the extension runs and that verify passes at the end as
constructing a test repository that would result in a shrink would be
nontrivial.
Augie Fackler <durin42@gmail.com> [Fri, 29 Apr 2011 08:46:21 -0500] rev 14032
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com> [Fri, 29 Apr 2011 08:43:05 -0500] rev 14031
Move test-dumprevlog to test-contrib in anticipation of more contrib tests
Augie Fackler <durin42@gmail.com> [Fri, 29 Apr 2011 08:04:54 -0500] rev 14030
shrink-revlog: use a bundler object (see d69c9510d648)
Augie Fackler <durin42@gmail.com> [Fri, 29 Apr 2011 08:01:10 -0500] rev 14029
shrink-revlog: update util.opener to scmutil.opener after d13913355390
Augie Fackler <durin42@gmail.com> [Fri, 29 Apr 2011 07:38:12 -0500] rev 14028
shrink-revlog: remove \ from docstring
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 13 Mar 2011 15:02:49 +0100] rev 14027
bookmarks: be more restrictive in our Exception catching
Patrick Mezard <pmezard@gmail.com> [Fri, 29 Apr 2011 14:56:23 +0200] rev 14026
strip: make it clear that --force discards changes (issue310)
Augie Fackler <durin42@gmail.com> [Fri, 29 Apr 2011 03:05:48 -0500] rev 14025
subrepo: tell Subversion when we are non-interactive (issue2759)
$ hg clone repo repo-clone -v
updating to branch default
resolving manifests
getting .hgsub
getting .hgsubstate
abort: svn: OPTIONS of 'https://subversion.srv/project': Server certificate
verification failed: issuer is not trusted (https://subversion.srv)
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Apr 2011 11:10:11 +0200] rev 14024
merge with stable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Apr 2011 11:04:39 +0200] rev 14023
tests: check for (*/sec) instead of (*B/sec) to match (X bytes/sec)
I just had: transferred 606 bytes in 2.9 seconds (211 bytes/sec)
Patrick Mezard <pmezard@gmail.com> [Fri, 29 Apr 2011 09:43:21 +0200] rev 14022
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com> [Fri, 29 Apr 2011 08:04:46 +0200] rev 14021
extdiff: fix broken symlinks handling (issue1909)
Matt Mackall <mpm@selenic.com> [Tue, 26 Apr 2011 10:51:19 -0500] rev 14020
tags: catch more corruption during cache parsing (issue2779)
Matt Mackall <mpm@selenic.com> [Mon, 25 Apr 2011 17:01:34 -0500] rev 14019
run-tests: do chdir for tests under a lock for thread safety
Matt Mackall <mpm@selenic.com> [Mon, 25 Apr 2011 16:17:08 -0500] rev 14018
run-tests: add iolock to vlog
Patrick Mezard <pmezard@gmail.com> [Tue, 26 Apr 2011 21:22:14 +0200] rev 14017
patch: remove redundant variable in iterhunks()
Martin Geisler <mg@aragost.com> [Tue, 26 Apr 2011 13:13:35 +0200] rev 14016
merge with stable
Martin Geisler <mg@aragost.com> [Tue, 26 Apr 2011 12:56:56 +0200] rev 14015
merge default heads
Martin Geisler <mg@aragost.com> [Tue, 26 Apr 2011 12:55:26 +0200] rev 14014
commit: improve --date help text
Patrick Mezard <pmezard@gmail.com> [Mon, 25 Apr 2011 21:20:44 +0200] rev 14013
merge with stable
Patrick Mezard <pmezard@gmail.com> [Mon, 25 Apr 2011 21:11:28 +0200] rev 14012
test-transplant: fix missing file addition
Steven Brown <StevenGBrown@gmail.com> [Mon, 25 Apr 2011 18:00:30 +0800] rev 14011
tests: add script to disable a selected wire protocol capability
This can be used to test that the client and server both fall back to the
previous wire protocol when the capability is not supported.
It is currently used by test-push-http.t and I plan to use it for the HTTP
long argument support tests.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 25 Apr 2011 14:03:12 +0200] rev 14010
mq: prevent traceback when qfinish patches not in series.
When mq status entry referencing a patches that is not in series `hg qfinish
-a` used to issue a traceback. This states is inconsistent but might happen
regularly when people misuse hg up -mq.
This changeset prevent hg from crashing. The faulty entry is finished anyway and
a warning is issued.
Idan Kamara <idankk86@gmail.com> [Mon, 25 Apr 2011 13:03:26 +0300] rev 14009
check-code: separate warnings to avoid repetitive str.startswith
Greg Ward <greg@gerg.ca> [Sun, 24 Apr 2011 17:30:50 -0400] rev 14008
atomictempfile: rewrite docstring to clarify rename() vs. close().
Greg Ward <greg@gerg.ca> [Sun, 24 Apr 2011 19:25:10 -0400] rev 14007
atomictempfile: avoid infinite recursion in __del__().
The problem is that a programmer using atomictempfile directly can
make an innocent everyday mistake -- not enough args to the
constructor -- which escalates badly. You would expect a simple
TypeError crash in that case, but you actually get an infinite
recursion that is surprisingly difficult to kill: it happens between
__del__() and __getattr__(), and Python does not handle infinite
recursion from __del__() well.
The fix is to not implement __getattr__(), but instead assign instance
attributes for the methods we wish to delegate to the builtin file
type: write() and fileno(). I've audited mercurial.* and hgext.* and
found no users of atomictempfile using methods other than write() and
rename(). I audited third-party extensions and found one (snap)
passing an atomictempfile to util.fstat(), so I also threw in
fileno().
The last time I submitted a similar patch, Matt proposed that we make
atomictempfile a subclass of file instead of wrapping it. Rejected on
grounds of unnecessary complexity: for one thing, it would make the
Windows implementation of posixfile quite a bit more complex. It would
have to become a subclass of file rather than a simple function -- but
since it's written in C, this is non-obvious and non-trivial.
Furthermore, there's nothing wrong with wrapping objects and
delegating methods: it's a well-established pattern that works just
fine in many cases. Subclassing is not the answer to all of life's
problems.
Patrick Mezard <pmezard@gmail.com> [Mon, 25 Apr 2011 18:42:31 +0200] rev 14006
run-tests: display diff before prompting with --interactive
Idan Kamara <idankk86@gmail.com> [Sat, 23 Apr 2011 00:52:21 +0300] rev 14005
check-code: warn about naked except clauses
Idan Kamara <idankk86@gmail.com> [Sat, 23 Apr 2011 00:51:25 +0300] rev 14004
eliminate various naked except clauses
Matt Mackall <mpm@selenic.com> [Sun, 24 Apr 2011 17:52:46 -0500] rev 14003
run-tests: fix some missing i/o locks
Matt Mackall <mpm@selenic.com> [Sun, 24 Apr 2011 16:46:37 -0500] rev 14002
run-tests: add a lock for console I/O
Matt Mackall <mpm@selenic.com> [Sun, 24 Apr 2011 16:42:15 -0500] rev 14001
run-tests: switch timeout handling from alarm to helper thread
This should be slightly more portable than signals and be compatible
with threaded dispatch.
Matt Mackall <mpm@selenic.com> [Sun, 24 Apr 2011 16:42:11 -0500] rev 14000
run-tests: add locking on results struct
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Apr 2011 23:33:48 +0200] rev 13999
run-tests: fix --interactive (after 994ad067ac6e)
- Do not prompt if there is no .err file
- Fix source and target paths
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Apr 2011 23:06:19 +0200] rev 13998
color: code simplification
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Apr 2011 23:06:18 +0200] rev 13997
test-status-color: fix terminfo code compatibility problem
On a linux host in xterm mode, 'none' is translated to:
\x1b[m\x1b(B
While it is the following on osx:
\x1b(B\x1b[m
Take advantage of the new color.color.X option to force it to a common value.
Andreas Freimuth <andreas.freimuth@united-bits.de> [Fri, 22 Apr 2011 16:43:06 +0200] rev 13996
hg-ssh: fix duplicate word in docstring
Matt Mackall <mpm@selenic.com> [Fri, 22 Apr 2011 14:04:34 -0500] rev 13995
run-tests: move test loop into a helper function
Matt Mackall <mpm@selenic.com> [Fri, 22 Apr 2011 12:24:22 -0500] rev 13994
run-tests: use a results dict
Matt Mackall <mpm@selenic.com> [Fri, 22 Apr 2011 11:36:40 -0500] rev 13993
run-tests: move blacklist and retest filtering to runone
Matt Mackall <mpm@selenic.com> [Fri, 22 Apr 2011 11:32:05 -0500] rev 13992
run-tests: keep a list of passed tests
Matt Mackall <mpm@selenic.com> [Fri, 22 Apr 2011 11:24:27 -0500] rev 13991
run-tests: move keyword checking into runone
Matt Mackall <mpm@selenic.com> [Fri, 22 Apr 2011 11:22:02 -0500] rev 13990
run-tests: add ignores list
Matt Mackall <mpm@selenic.com> [Thu, 21 Apr 2011 18:38:30 -0500] rev 13989
run-tests: move existence/name format check into runone
Matt Mackall <mpm@selenic.com> [Thu, 21 Apr 2011 18:19:45 -0500] rev 13988
run-tests: move interactive handling into runone
Danek Duvall <duvall@comfychair.org> [Thu, 21 Apr 2011 13:47:45 -0700] rev 13987
color: add support for terminfo-based attributes and color
Using terminfo instead of hard-coding ECMA-48 control sequences provides a
greater assurance that the terminal codes are correct for the current
terminal type; not everything supports the ANSI escape codes.
It also allows us to use a wider range of colors when a terminal emulator
supports it (such as 16- or 256-color xterm), and a few more non-color
attributes, such as the ever-popular blink.
Adrian Buehlmann <adrian@cadifra.com> [Thu, 21 Apr 2011 21:16:54 +0200] rev 13986
move system_rcpath and user_rcpath to scmutil
Adrian Buehlmann <adrian@cadifra.com> [Thu, 21 Apr 2011 20:54:45 +0200] rev 13985
move os_rcpath from util to scmutil
Adrian Buehlmann <adrian@cadifra.com> [Thu, 21 Apr 2011 20:14:29 +0200] rev 13984
move rcpath from util to scmutil
Matt Mackall <mpm@selenic.com> [Thu, 21 Apr 2011 15:11:28 -0500] rev 13983
merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 21 Apr 2011 15:11:19 -0500] rev 13982
merge with i18n
Matt Mackall <mpm@selenic.com> [Thu, 21 Apr 2011 15:10:59 -0500] rev 13981
merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 19 Apr 2011 12:00:22 -0300] rev 13980
i18n-pt_BR: synchronized with 1416b9118540
Martin Geisler <mg@lazybytes.net> [Tue, 19 Apr 2011 09:46:45 +0200] rev 13979
i18n: merge with stable
Martin Geisler <mg@lazybytes.net> [Tue, 19 Apr 2011 09:46:24 +0200] rev 13978
i18n-da: synchronize with 1184bb274cb3
Martin Krüger <martin.krueger@gmx.com> [Tue, 19 Apr 2011 09:30:42 +0200] rev 13977
i18n-de: improve grammar
Matt Mackall <mpm@selenic.com> [Thu, 21 Apr 2011 15:08:48 -0500] rev 13976
win32: Wine doesn't know about hardlinks
Adrian Buehlmann <adrian@cadifra.com> [Thu, 21 Apr 2011 16:06:19 +0200] rev 13975
move walkrepos from util to scmutil
Adrian Buehlmann <adrian@cadifra.com> [Thu, 21 Apr 2011 13:18:52 +0200] rev 13974
move checkfilename from util to scmutil
checkfilename is specific to Mercurial, since it contains the knowledege
that Mercurial can't track files with \n or \r in the name.
Adrian Buehlmann <adrian@cadifra.com> [Thu, 21 Apr 2011 12:10:03 +0200] rev 13973
scmutil: fix erroneous Abort call
This fixes d13913355390 (affected Windows only).
Adrian Buehlmann <adrian@cadifra.com> [Wed, 20 Apr 2011 22:43:31 +0200] rev 13972
move path_auditor from util to scmutil
Adrian Buehlmann <adrian@cadifra.com> [Wed, 20 Apr 2011 21:41:41 +0200] rev 13971
move canonpath from util to scmutil
Adrian Buehlmann <adrian@cadifra.com> [Wed, 20 Apr 2011 19:54:57 +0200] rev 13970
move opener from util to scmutil
Patrick Mezard <pmezard@gmail.com> [Wed, 20 Apr 2011 23:30:07 +0200] rev 13969
merge with stable
Patrick Mezard <pmezard@gmail.com> [Wed, 20 Apr 2011 23:15:18 +0200] rev 13968
convert: make filemap prune useless branch closing revs (issue2774)
A branch closing revision only applies if one of its parents belongs to the
branch being closed. Otherwise the filemap can prune it too.
Matt Mackall <mpm@selenic.com> [Wed, 20 Apr 2011 14:28:40 -0500] rev 13967
dispatch: improve repository not found message
This should help clarify what the problem is in various problematic
cases like ssh.
Steven Stallion <sstallion@gmail.com> [Wed, 20 Apr 2011 00:01:50 -0400] rev 13966
hgweb: support disabling page cache
By default, hgweb_mod supports caching via the ETag header. This can
cause some confusion with browsers which cache aggressively. This change
preserves existing behavior while giving the administrator a knob to
disable the ETag header.
Matt Mackall <mpm@selenic.com> [Wed, 20 Apr 2011 12:44:32 -0500] rev 13965
merge with stable
Steven Stallion <sstallion@gmail.com> [Tue, 19 Apr 2011 23:37:06 -0400] rev 13964
hgweb: support alternate logo url
Clicking on the logo image/text in the hgweb interface brings the
user to the Mercurial project page. The majority of users expect that
this would bring them to the top level index. I have added a new template
variable named `logourl' which allows an administrator to change this
behavior. To stay compatible with existing behavior, `logourl' will
default to http://mercurial.selenic.com/. This change is very useful in
large installations where jumping to the index is common.
Kevin Bullock <kbullock@ringworld.org> [Tue, 19 Apr 2011 13:33:43 -0500] rev 13963
identify: further clarification of help
Following on to 1416b9118540, correct a minor grammar issue, re-wrap to
72 columns, and further clarify wording.
Adrian Buehlmann <adrian@cadifra.com> [Tue, 19 Apr 2011 12:42:53 +0200] rev 13962
add: introduce a warning message for non-portable filenames (issue2756) (BC)
On POSIX platforms, the 'add', 'addremove', 'copy' and 'rename' commands now
warn if a file has a name that can't be checked out on Windows.
Example:
$ hg add con.xml
warning: filename contains 'con', which is reserved on Windows: 'con.xml'
$ hg status
A con.xml
The file is added despite the warning.
The warning is ON by default. It can be suppressed by setting the config option
'portablefilenames' in section 'ui' to 'ignore' or 'false':
$ hg --config ui.portablefilenames=ignore add con.xml
$ hg sta
A con.xml
If ui.portablefilenames is set to 'abort', then the command is aborted:
$ hg --config ui.portablefilenames=abort add con.xml
abort: filename contains 'con', which is reserved on Windows: 'con.xml'
On Windows, the ui.portablefilenames config setting is irrelevant and the
command is always aborted if a problematic filename is found.
Adrian Buehlmann <adrian@cadifra.com> [Tue, 19 Apr 2011 14:56:47 +0200] rev 13961
paper: use monospace font for description
Idan Kamara <idankk86@gmail.com> [Tue, 19 Apr 2011 14:56:46 +0300] rev 13960
update: fix check for no rev when a date is given
The previous check caught a corner case in which rev
was pointing to 0.
Martin Geisler <mg@lazybytes.net> [Tue, 19 Apr 2011 15:19:54 +0200] rev 13959
merge with stable
Martin Geisler <mg@lazybytes.net> [Tue, 19 Apr 2011 15:15:56 +0200] rev 13958
hgweb: detect change based on changelog size too
Before, there was a race between an access and a modification made
within the same second.
Martin Geisler <mg@lazybytes.net> [Tue, 19 Apr 2011 13:25:19 +0200] rev 13957
rollback: lower-case warning issued when branch cannot be reset
Also improved the word order.
Martin Geisler <mg@lazybytes.net> [Tue, 19 Apr 2011 12:04:44 +0200] rev 13956
tests: remove redundant mkdir
There are still many tests that check that a bare 'hg init'
initializes the current directory.
Martin Geisler <mg@lazybytes.net> [Mon, 18 Apr 2011 13:57:22 +0200] rev 13955
help config: explain that config files do not exist by default
Inspired by critique given on StackOverflow where a user writes:
I can have a good guess at what "%USERPROFILE%" might signify but
none of the files listed in the "hg help config" output exist after
running the installer. Previous experience would suggest that
missing files mean something somewhere has gone seriously wrong.
http://stackoverflow.com/questions/2329023/2351139#2351139
Matt Mackall <mpm@selenic.com> [Mon, 18 Apr 2011 20:52:08 -0500] rev 13954
merge with stable
Idan Kamara <idankk86@gmail.com> [Tue, 19 Apr 2011 01:08:35 +0300] rev 13953
identify: restructure code to make it more readable
Idan Kamara <idankk86@gmail.com> [Tue, 19 Apr 2011 00:41:47 +0300] rev 13952
identify/help: say what the command does first, mention bookmarks
Adrian Buehlmann <adrian@cadifra.com> [Sun, 17 Apr 2011 21:34:25 +0200] rev 13951
templatefilters: improve person() for john.doe@example.com
BEFORE: person('john.doe@example.com') -> 'john'
AFTER: person('john.doe@example.com') -> 'john doe'
Adrian Buehlmann <adrian@cadifra.com> [Sun, 17 Apr 2011 11:37:11 +0200] rev 13950
help: do not show full help text for command on option errors
Example
$ hg clone --jump foo bar
hg clone: option --jump not recognized
hg clone [OPTION]... SOURCE [DEST]
make a copy of an existing repository
options:
-U --noupdate the clone will include an empty working copy (only a
repository)
-u --updaterev REV revision, tag or branch to check out
-r --rev REV [+] include the specified changeset
-b --branch BRANCH [+] clone only the specified branch
--pull use pull protocol to copy metadata
--uncompressed use uncompressed transfer (fast over LAN)
-e --ssh CMD specify ssh command to use
--remotecmd CMD specify hg command to run on the remote side
--insecure do not verify server certificate (ignoring
web.cacerts config)
[+] marked option can be specified multiple times
use "hg help clone" to show the full help text
Motivation for this change
If the user already has specified the command, he probably already knows
the command to some extent. Apparently, he has a problem with the options,
so we show him just the synopsis with the short help and the details about
the options, with a hint on the last line how to get the full help text.
Why is Mercurial better with this change?
Experts who just forgot about the details of an option don't get that
much text thrown at them, while the newbies still get a hint on the last
line how to get the full help text.
Adrian Buehlmann <adrian@cadifra.com> [Sun, 17 Apr 2011 17:55:34 +0200] rev 13949
store: add some doctests
Adrian Buehlmann <adrian@cadifra.com> [Sun, 17 Apr 2011 01:44:09 +0200] rev 13948
paper: don't add breaks on the remaining instances of desc
fixes ebe1ddbbefd7
Adrian Buehlmann <adrian@cadifra.com> [Sat, 16 Apr 2011 20:08:43 +0200] rev 13947
checkwinfilename: use %r in format string
Steven Brown <StevenGBrown@gmail.com> [Sun, 17 Apr 2011 02:15:47 +0800] rev 13946
tests: new test cases for the unbundlehash capability
Adrian Buehlmann <adrian@cadifra.com> [Fri, 15 Apr 2011 16:15:32 +0200] rev 13945
copy: do not copy file if name is disallowed anyway
Adrian Buehlmann <adrian@cadifra.com> [Fri, 15 Apr 2011 16:15:30 +0200] rev 13944
util: new function checkfilename
checkfilename checks for restrictions on filenames imposed by Mercurial
itself, irrespective of on what platform it is run.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 15 Apr 2011 16:15:28 +0200] rev 13943
opener: use %r in format string for abort
Shuhei Takahashi <takahashi.shuhei@gmail.com> [Sat, 16 Apr 2011 01:05:56 +0900] rev 13942
wireproto: allow unbundle with hashed heads parameter (issue2126)
Current wire protocol of unbundle sends the list of all heads in the remote
repository to avoid race condition. This causes "URL too long" error on HTTP
server when the repository has many heads.
This change allows clients to send SHA1 hash of sorted head hashes instead.
Also, this introduces "unbundlehash" capability to inform them that the server
accepts hashed heads parameter.
Matt Mackall <mpm@selenic.com> [Fri, 15 Apr 2011 23:46:59 -0500] rev 13941
merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 15 Apr 2011 23:45:41 -0500] rev 13940
encoding: avoid localstr when a string can be encoded losslessly (issue2763)
localstr's hash method exists to prevent bogus matching on lossy local
encodings. For instance, we don't want 'caf?' to match 'café' in an
ASCII locale.
But when café can be losslessly encoded in the local charset, we can
simply use a normal string and avoid the hashing trick.
This avoids using localstr's hash method, which would prevent a match between
Matt Mackall <mpm@selenic.com> [Fri, 15 Apr 2011 20:35:59 -0500] rev 13939
merge with stable
Idan Kamara <idankk86@gmail.com> [Fri, 15 Apr 2011 20:07:44 +0300] rev 13938
revset: optimize stringset when subset == entire repo
if range(len(repo)) is passed to stringset and x is a valid rev
(checked before) then x is guaranteed to be in subset, we can check
for that by comparing the lengths of the sets
Idan Kamara <idankk86@gmail.com> [Fri, 15 Apr 2011 16:35:32 +0300] rev 13937
help/revset: fix grammar
timeless <timeless@mozdev.org> [Thu, 14 Apr 2011 10:00:15 +0200] rev 13936
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org> [Thu, 14 Apr 2011 10:00:14 +0200] rev 13935
record: improve help test coverage
Adrian Buehlmann <adrian@cadifra.com> [Fri, 15 Apr 2011 10:56:26 +0200] rev 13934
paper: preserve whitespace on description instead of adding breaks
This preserves the indentation of text in the changeset description.
This is useful for example for descriptions containing command line
use case examples like:
$ hg -q heads
13934:648a834cca14
13912:71ea5b2b9517
Without this patch, such space-char indented text was just left aligned.
Augie Fackler <durin42@gmail.com> [Wed, 13 Apr 2011 13:06:35 -0500] rev 13933
compact style: show bookmarks in the same manner as tags
Augie Fackler <durin42@gmail.com> [Wed, 13 Apr 2011 12:30:41 -0500] rev 13932
revsets: preserve ordering with the or operator
This is valuable because now revsets like 'bookmarks() or tip' will
always show tip after bookmarks unless tip was itself a bookmark. This
is a somewhat contrived example, but this behavior is useful for
"where am I" type aliases that use log and revsets.
Md. O. Shayan <mdoshayan@gmail.com> [Wed, 13 Apr 2011 07:40:24 +0530] rev 13931
hgweb: set minimum number of revision to display to 1 when revcount is 0
When revcount goes to 0 nothing is displayed in hgweb. This patch sets revcount to max(revcount, 1).
Matt Mackall <mpm@selenic.com> [Wed, 13 Apr 2011 12:57:24 -0500] rev 13930
zeroconf: clean up naked exceptions
Idan Kamara <idankk86@gmail.com> [Mon, 11 Apr 2011 21:44:22 +0300] rev 13929
localrepo: don't add deleted files to list of modified/added files (issue2761)
If a file is deleted (rm, not 'hg rm') from the working dir
an attempt to run 'hg diff -r X', with the file being present in X will
cause an abort.
We didn't check if the file has been deleted from the working dir
and later on tried to open it to compare with the one from X, causing the abort.
This fix adds that check. Consequently, no output will be returned.
Adrian Buehlmann <adrian@cadifra.com> [Mon, 11 Apr 2011 10:06:57 +0200] rev 13928
path_auditor: eliminate local function 'check' in __call__
Augie Fackler <durin42@gmail.com> [Mon, 11 Apr 2011 07:34:40 -0500] rev 13927
subrepo: trailing whitespace cleanup
Adrian Buehlmann <adrian@cadifra.com> [Sun, 10 Apr 2011 19:31:49 +0200] rev 13926
util: move checkosfilename call from path_auditor to opener
path_auditor is used for checking patterns too, but a pattern is not a valid
filename.
This patch fixes 98ee3dd5bab4, which introduced the bug:
$ hg log -l3 glob:**.py
abort: filename contains '*', which is reserved on Windows: mercurial\**.py
Idan Kamara <idankk86@gmail.com> [Sun, 10 Apr 2011 11:30:53 +0300] rev 13925
tests: add tests for non-existant branch/tag/bookmark
Yuya Nishihara <yuya@tcha.org> [Sun, 10 Apr 2011 10:01:42 +0900] rev 13924
hgweb: add bookmarks listing to summary page of gitweb/monoblue styles
Yuya Nishihara <yuya@tcha.org> [Sun, 10 Apr 2011 10:01:39 +0900] rev 13923
hgweb: remove useless notip handling from bookmarks listing
Yuya Nishihara <yuya@tcha.org> [Sun, 10 Apr 2011 10:01:37 +0900] rev 13922
hgweb: sort bookmarks in the same manner as console command
Yuya Nishihara <yuya@tcha.org> [Sun, 10 Apr 2011 06:37:20 +0900] rev 13921
hgweb: add bookmarks listing to raw style with test case
Md. O. Shayan <mdoshayan@gmail.com> [Sat, 09 Apr 2011 23:13:17 +0530] rev 13920
grep: don't print data from binary files for matches (issue2614)
Idan Kamara <idankk86@gmail.com> [Sat, 09 Apr 2011 23:53:23 +0300] rev 13919
color: reset win32 console color in a finally block
Matt Mackall <mpm@selenic.com> [Sat, 09 Apr 2011 15:52:19 -0500] rev 13918
tests: better output on timeouts
Formerly, timeouts would generate huge scrollback-destroying diffs and
weird -15 return codes in the summary. Now we simply report "timed
out".
John Mulligan <phlogistonjohn@asynchrono.us> [Mon, 07 Feb 2011 16:37:03 -0500] rev 13917
acl: add branch tests for the current behavior of acl extension
Adds simple tests for the acl.allow.branches and acl.deny.branches
configuration options of the acl extension.
Adrian Buehlmann <adrian@cadifra.com> [Wed, 06 Apr 2011 18:09:43 +0200] rev 13916
path_auditor: check filenames for basic platform validity (issue2755)
Example (on Windows):
$ hg parents
$ hg manifest tip
con.xml
$ hg update
abort: filename contains 'con', which is reserved on Windows: con.xml
Before this patch, update produced (as explained in issue2755):
$ hg update
abort: No usable temporary filename found
I've added the new function checkwinfilename to util.py and not to windows.py,
so that we can later call it when running on posix platforms too, for when we
decide to implement a (configurable) warning message on 'hg add'.
As per this patch, checkwinfilename is currently only used when running
on Windwows.
path_auditor calls checkosfilename, which is a NOP on posix and an alias for
checkwinfilename on Windows.
Idan Kamara <idankk86@gmail.com> [Fri, 08 Apr 2011 17:47:58 +0300] rev 13915
revset: rearrange code so functions are sorted alphabetically
Idan Kamara <idankk86@gmail.com> [Thu, 07 Apr 2011 19:24:16 +0300] rev 13914
revset: abort when tag or bookmark doesn't exist
Matt Mackall <mpm@selenic.com> [Thu, 07 Apr 2011 15:08:15 -0500] rev 13913
merge with stable