Brendan Cully <brendan@kublai.com> [Sun, 11 Mar 2007 14:21:09 -0700] rev 4205
Clarify update help text for update without an explicit revision
Brendan Cully <brendan@kublai.com> [Mon, 12 Mar 2007 15:02:59 -0700] rev 4204
Improve hg branch -f help text
Brendan Cully <brendan@kublai.com> [Mon, 12 Mar 2007 14:50:19 -0700] rev 4203
Add test for branch shadowing
Brendan Cully <brendan@kublai.com> [Mon, 12 Mar 2007 14:44:14 -0700] rev 4202
branch: require --force to shadow existing branches
Brendan Cully <brendan@kublai.com> [Mon, 12 Mar 2007 13:58:06 -0700] rev 4201
Strip [PATCH...] from message subject when importing patches
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:21:33 -0300] rev 4200
Merge a bunch of matcher and locate fixes.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:01:02 -0300] rev 4199
Optimize return value of util._matcher for hgignore case
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:01:00 -0300] rev 4198
Optimize return value of util._matcher for common command line case
This will trigger every time somebody runs something like "hg diff"
or "hg status" without any arguments.
The important part here is returning util.always as the match function,
which is a much simpler (and faster) function than the usual return
value, and allows other code to just skip the filtering if it knows
all files will match.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:59 -0300] rev 4197
remove unused "head" hack from util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:58 -0300] rev 4196
locate: exit(1) if we didn't print any file
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:57 -0300] rev 4195
change locate to use relglobs by default
This makes its default behaviour useful again (
issue108), and
changes it search the entire repository by default (instead
of just the cwd), just like all other commands.
It also hides
issue204 by default, but you'll still see the
same behaviour if you give it a relpath: pattern.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:55 -0300] rev 4194
localrepo.walk: if we're walking a specific revision, sort the files
This is more consistent with our behaviour while walking the working directory.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:54 -0300] rev 4193
dirstate.statwalk: explicitly test for ignored directories
This removes a hack where we appended '/' to a dirname so that:
- it would not appear on the "dc" dict
- it would always be matched by the match function
This was a contorted way of checking if the directory was matched by
some hgignore pattern, and it would still fail with some uses of
--include/--exclude patterns.
Things would still work fine if we removed the check altogether and
just appended things to "work" directly, but then we would end up
walking ignored directories too, which could be quite a bit of work.
This allows further simplification of the match function returned by
util._matcher, and fixes walking the working directory with a
--include pattern that matches only the end of a name.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:53 -0300] rev 4192
util._matcher: unify pattern normalization
This should fix
issue347.
It also highlights one issue with the directory walking code when
you have an --include pattern that matches the end of a filename.
This is fixed by the next patch.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:52 -0300] rev 4191
make the output of test-walk more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:51 -0300] rev 4190
util.*matcher: change default "names" argument
names=['.'] means "include (recursively) only files from the current subdir";
the function then did a hack to walk the whole tree. Clean that up.
This also fixes a problem where "--include ." works in a subdir, but not
on the tree root.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:49 -0300] rev 4189
util._matcher: fix handling of path: patterns
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:48 -0300] rev 4188
util._matcher: fix handling of relglob: patterns
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:47 -0300] rev 4187
A 'glob:foo?bar' pattern determines a root - the tree root
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:46 -0300] rev 4186
Leave normalization of patterns to util._matcher
Passing [] to util.cmdmatcher accidentally fixes walking of files
with "\n" in the name.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:45 -0300] rev 4185
util._matcher: update comments
This should match the code better. Except for bugs...
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:43 -0300] rev 4184
remove obsolete code from patch.diff
repo.status already does this filtering. If the caller supplies a set of
changes, it's his responsibility to filter out what he doesn't want.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:42 -0300] rev 4183
small globprefix fix
Brendan Cully <brendan@kublai.com> [Sat, 10 Mar 2007 17:45:32 -0800] rev 4182
Merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Mar 2007 20:08:13 +0100] rev 4181
merge with crew-stable
Matt Mackall <mpm@selenic.com> [Tue, 13 Mar 2007 18:53:23 -0500] rev 4180
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com> [Tue, 13 Mar 2007 18:50:02 -0500] rev 4179
Move branch read/write to dirstate where it belongs
Matt Mackall <mpm@selenic.com> [Tue, 13 Mar 2007 15:47:55 -0500] rev 4178
Minor default branch cleanups
Matt Mackall <mpm@selenic.com> [Tue, 13 Mar 2007 15:18:10 -0500] rev 4177
Move branches.cache to branch.cache
Keeps old clients from conflicting with new caches, makes features
logic unnecessary.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 13 Mar 2007 15:02:33 -0300] rev 4176
"default" is the default branch name
Brendan Cully <brendan@kublai.com> [Sat, 10 Mar 2007 17:36:29 -0800] rev 4175
Test update to branch tip
Brendan Cully <brendan@kublai.com> [Sat, 10 Mar 2007 17:36:27 -0800] rev 4174
Make update with no node jump to the tip of the current branch
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 22:03:23 -0300] rev 4173
fix qrefresh'ing an empty patch
This is not superefficient (the commit will have to walk the whole tree),
but it works.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 22:03:22 -0300] rev 4172
statwalk: don't put self.root in the files list
That list is supposed to contain internal, normalized names ("/"-separated,
relative to the repo root), not OS-native paths.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 22:03:21 -0300] rev 4171
fix qclone to a remote repo
This fixes
issue467. -stable still needs something like revision
55578a8d7e84 - mq: allow push if -r is given explicitly.
In the meantime, hg qpop -a; hg qclone . ssh://... is a workaround.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 22:03:20 -0300] rev 4170
Save an absolute path in repo.path
This should keep things working if the process changes directories
after creating a repo object.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Mar 2007 19:57:26 +0100] rev 4169
Add tests for .hg/branches.cache feature list.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Mar 2007 19:12:03 +0100] rev 4168
Add a features list to branches.cache to detect caches of old hg versions.
The leading space in the written file makes sure that the feature list never
can match an existing version, even if the first feature can be read as hex.
Additionally old hg versions display the id with --debug, too.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Mar 2007 18:09:02 +0100] rev 4167
Store empty (default) branch in branch cache, too.
Operations on this branch don't work otherwise.
Reading branches.cache had to be adjusted to allow an empty label.
Adjusted reading of the cache tip for symmetry, no functional change here.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 08 Mar 2007 20:08:24 -0300] rev 4166
small fixes for the parent patch
- format.usestore is a boolean option
- python wart: ("revlogv1") is a string, not a tuple
- only create a dummy changelog if we're using a store
- add a test
Matt Mackall <mpm@selenic.com> [Thu, 08 Mar 2007 16:13:16 -0600] rev 4165
Merge with crew
Michael Gebetsroither <michael.geb@gmx.at> [Thu, 08 Mar 2007 22:36:12 +0100] rev 4164
hgweb: use the given revision in the name of the archive
If you ask for an archive in hgweb by tagname the directory in the archive
should include the tagname not the changeset-id.
Matt Mackall <mpm@selenic.com> [Thu, 08 Mar 2007 16:12:52 -0600] rev 4163
Allow disabling store format to work with absurdly long filenames
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 07 Mar 2007 15:26:03 -0300] rev 4162
incoming/outgoing: print the name of the other repo
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 07 Mar 2007 15:26:00 -0300] rev 4161
localrepo.status: use manifest.find on "lookup" files
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 07 Mar 2007 15:25:59 -0300] rev 4160
localrepo.status: fcmp gets a getnode function instead of the manifest
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 07 Mar 2007 15:25:58 -0300] rev 4159
fix manifest.find
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 07 Mar 2007 15:06:57 +0100] rev 4158
merge with crew-stable