- Dec 15, 2011
-
-
Martin Geisler authored
-
Martin Geisler authored
-
- Dec 14, 2011
-
-
Renato Cunha authored
When a user requested a diff between a revision (r1) that contained a subrepo and another (r2) that did not, mercurial would crash if r1 was specified before r2 but would execute the diff otherwise. This fixes this behavior by skipping the missing subrepo in the diff.
-
- Dec 15, 2011
-
-
Martin Geisler authored
-
- Dec 10, 2011
-
-
Martin Geisler authored
The return statement belongs to the lines above.
-
- Dec 09, 2011
-
-
Martin Geisler authored
-
Martin Geisler authored
If a largefile is introduced on the branch that is merged into the working copy, then 'hg status' would abort with an error like: $ hg status abort: .hglf/foo@33fdd332ec64: not found in manifest! The problem was that the largefiles status code only looked in the first parent for the largefile. Largefiles are now always reported as modified if they don't exist in the first parent -- this matches the behavior of localrepo.status for normal files.
-
Martin Geisler authored
Using regular expressions to cut off a (fixed) string prefix is overly complicated and wasteful.
-
Martin Geisler authored
-
- Dec 07, 2011
-
-
Martin Geisler authored
Mercurial 1.7 added the --subrepos flag to status and archive and the largefiles code was still compatible with the old method signatures.
-
- Dec 09, 2011
-
-
Martin Geisler authored
I always found it hard to figure out what the debug code meant without the separators.
-
Thomas Arendsen Hein authored
Extended the list of safe characters introduced in 86fc364ca5f8 to include everything from pipes._safechars, which is only available on Unix platforms. Place "-" at the end of the range to avoid backslash-escape. New characters: @%+=:,
-
- Dec 08, 2011
-
-
Matt Mackall authored
-
kiilerix authored
This restores compatibility with hg-over-ssh servers that don't parse commandlines as sh does but works ok in the most common cases.
-
- Nov 16, 2011
-
-
Kevin Bullock authored
This makes bookmarks.update() and bookmarks.updatecurrentbookmark() return True or False to indicate whether the bookmark was updated or not. This allows callers to e.g. abort if the update failed.
-
- Dec 07, 2011
-
-
Kevin Bullock authored
-
Kevin Bullock authored
Makes the 'nothing to merge' abort messages in commands.py consistent with those in merge.py. Also makes commands.merge() and merge.update() use hints. The tests show the changes.
-
Kevin Bullock authored
-
Na'Tosha Bard authored
-
- Dec 06, 2011
-
-
Olav Reinert authored
-
- Dec 08, 2011
-
-
Matt Mackall authored
-
- Dec 07, 2011
-
-
Matt Mackall authored
-
- Dec 06, 2011
-
-
Matt Mackall authored
-
Christian Ebert authored
-
- Dec 05, 2011
-
-
Matt Mackall authored
-
Matt Mackall authored
-
- Dec 04, 2011
-
-
Patrick Mezard authored
Before: >>> str(url('file:///c:/tmp/foo/bar')) 'file:c%3C/tmp/foo/bar' After: >>> str(url('file:///c:/tmp/foo/bar')) 'file:///c%3C/tmp/foo/bar' The previous behaviour had no effect on mercurial itself (clone command for instance) because we fortunately called .localpath() on the parsed URL. hgsubversion was not so lucky and cloning a local subversion repository on Windows no longer worked on the default branch (it works on stable because de7e2fba4326 defeats the hasdriveletter() test in url class). I do not know if the %3C is correct or not but svn accepts file:// URLs containing it. Mads fixed it in de7e2fba4326, so we can always backport should the need arise.
-
- Dec 02, 2011
-
-
Wagner Bruna authored
A convert run with a branchmap made with echo default namedbranch > branchmap on Windows fails silently and surprisingly; it actually adds a space after 'namedbranch', so it ends up mapping "default namedbranch" to "". This also affects splicemaps, since the same parser is used for both.
-
Patrick Mezard authored
I modified check-code.py "$?" detection because I thought my use was legit, we cannot test exit status of pipelines commands except for the last one without this. So it now tolerates "[$?" which is unlikely to be added by mistake. Tested on: - OSX + svn 1.7.1 - Linux + svn 1.6.12
-
Patrick Mezard authored
-
Patrick Mezard authored
I have not tried to produce the bug but here is idea: f85c0034a062 stopped passing the modified files list to commit. This makes commit more fragile since we better not touch unrelated files by mistake. But putcommit() still applies file changes before exiting upon ignored revisions. So in theory, we could apply changes from a skipped branch then commit them as part of another revision. This patch makes the sink apply the changes after possibly skipping the revision. The real fix would be to use svn commit --targets option to pass the file names in an argument file. Unfortunately, it seems to be bugged in svn 1.7.1: http://svn.haxx.se/dev/archive-2011-11/0211.shtml
-
- Dec 01, 2011
-
-
Greg Ward authored
The contract for repo.destroyed() is that it is called whenever changesets are destroyed, either by strip or by rollback. That contract was inadvertently broken in 7c26ce9edbd2, when we made a chunk of code conditional on destroying one of the working dir's parents. Oops: it doesn't matter *which* changesets are destroyed or what their relationship is to the working dir, we should call repo.destroyed() whenever we destroy changesets.
-
Matt Mackall authored
-
Matt Mackall authored
-
Matt Mackall authored
-
Matt Mackall authored
An alias for 'log' was stored in the same command table as '^log|history'. If the hash function happens to give the latter first, the alias is effectively ignored when matching 'log'.
-
Patrick Mezard authored
As of svn 1.7, many svn calls expect "canonical" paths. In theory, we should call svn.core.*canonicalize() on all paths before passing them to the API. Instead, we assume the base url is canonical and copy the behaviour of svn URL encoding function so we can extend it safely with new components.
-
- Nov 30, 2011
-
-
Na'Tosha Bard authored
-
- Dec 01, 2011
-
-
Sune Foldager authored
Calling branchmap() or similar on a bundlerepo would write the bundle-augmented branch cache to disk, requiring a subsequent expensive rebuild when the repo is used without the bundle.
-
Matt Mackall authored
-