Brendan Cully <brendan@kublai.com> [Mon, 18 Jun 2007 12:38:54 -0700] rev 4623
Make fast-forward merges full merges
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4622
hooks: separate hook code into a separate module
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4621
dispatch: fix handling of incorrect number of arguments
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4620
dirstate: pull ignore smarts out of ui
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4619
encoding: pull fallbackencoding out of localrepo into early parsing
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4618
extensions: kill ui readhooks
Move .hgrc extension loading into localrepo
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4617
extensions: pull extension-aware bits out of ui
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4616
dirstate: refactor checkinterfering
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4615
dirstate: hide some more internals
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4614
dirstate: hide internal vars
Add an __iter__ method so commands don't need to poke at _map.
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4613
localrepo and dirstate: rename reload to invalidate
We want to avoid actually reloading if possible.
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4612
dirstate: simplify dirty handling
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4611
dirstate: lazify and lambdafy _slash
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4610
dirstate: simplify state()
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4609
dirstate: move ignore to its own file
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4608
dirstate: replace clear()
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:33 -0500] rev 4607
dirstate: fold parse into read
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:33 -0500] rev 4606
dirstate: make reload lazy
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:33 -0500] rev 4605
dirstate: lazify initdirs
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:33 -0500] rev 4604
dirstate: lazify copymap, _branch, and _pl
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:33 -0500] rev 4603
dirstate: use getattr rather than lazyread
Brendan Cully <brendan@kublai.com> [Mon, 18 Jun 2007 11:13:16 -0700] rev 4602
Fix up tests for new branch message
Brendan Cully <brendan@kublai.com> [Mon, 18 Jun 2007 10:44:43 -0700] rev 4601
Notify the user that hg branch does not create a branch until commit
Brendan Cully <brendan@kublai.com> [Sun, 17 Jun 2007 20:09:35 -0700] rev 4600
patchbomb: fix PAGER buglet introduced in 88fc92b0b821
Patrick Mezard <pmezard@gmail.com> [Sun, 17 Jun 2007 20:35:43 +0200] rev 4599
patchbomb: page patchbomb messages only if PAGER is defined.
Paging is complicated under win32. It is just better to avoid it by default.
Patrick Mezard <pmezard@gmail.com> [Sun, 17 Jun 2007 20:35:32 +0200] rev 4598
cmdutil: add missing "time" import.
Patrick Mezard <pmezard@gmail.com> [Sun, 17 Jun 2007 20:08:06 +0200] rev 4597
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 17 Jun 2007 19:40:02 +0200] rev 4596
patchbomb: flush ui before delegating to pager.
Patrick Mezard <pmezard@gmail.com> [Sun, 17 Jun 2007 19:39:47 +0200] rev 4595
test-patchbomb: fix non-existing --date parameter and filtering regexps.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Wed, 13 Jun 2007 15:02:09 +0300] rev 4594
test-patchbomb: sed -e may not work with extended regexps
Non-GNU versions of the sed(1) utility (i.e. on Solaris or BSD)
may not support extended regexps (i.e. including \| branches),
or may need a special option to enable it (like -E instead of -e).
Expand the sed RE in tests/test-patchbomb to fix running this
test on FreeBSD and Solaris.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 17 Jun 2007 14:11:30 +0200] rev 4593
Make --import-branch option actually work (- is translated to _)
Eric Hopper <hopper@omnifarious.org> [Thu, 14 Jun 2007 09:01:51 -0700] rev 4592
Add --import-branch option to hg import to pull in branch information without --exact
Brendan Cully <brendan@kublai.com> [Thu, 14 Jun 2007 16:19:58 -0700] rev 4591
convert: remove pdb call. *blush*
Brendan Cully <brendan@kublai.com> [Thu, 14 Jun 2007 16:12:08 -0700] rev 4590
convert: fix various authormap handling bugs
Edouard Gomez <ed.gomez@free.fr> [Thu, 14 Jun 2007 23:25:55 +0200] rev 4589
convert extension: Add support for username mapping
Allows mapping usernames to new ones during conversion process.
- Use -A option for first import
- Then at the end of the conversion process and if the destination
repo supports authorfile attribute, author map content is copied
to the file pointed by the authorfile call.
- On incremental conversions w/o any -A option specified, the
destination authorfile, if any, gets read automatically.
EG: This allows mapping unix system usernames used in CVS accounts
to a more typical "Firstname Lastname <address@server.org>" pair.
Edouard Gomez <ed.gomez@free.fr> [Thu, 14 Jun 2007 23:25:55 +0200] rev 4588
convert extension: Save a few opens on the map file
Save a few opens on the map file adding a class attribute
Brendan Cully <brendan@kublai.com> [Thu, 14 Jun 2007 13:32:35 -0700] rev 4587
Merge with stable
Brendan Cully <brendan@kublai.com> [Thu, 14 Jun 2007 10:58:49 -0700] rev 4586
Make parents with a file but not a revision use working directory revision.
Brendan Cully <brendan@kublai.com> [Thu, 14 Jun 2007 10:59:17 -0700] rev 4585
Merge with crew
Brendan Cully <brendan@kublai.com> [Thu, 14 Jun 2007 10:58:49 -0700] rev 4584
Make parents with a file but not a revision use working directory revision.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jun 2007 12:54:06 +0200] rev 4583
Reverted changesets 9d1380e5c8c5 and 1d46169ec197: show @ as glog parent again.
Repainted the bikeshed with its original color.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jun 2007 11:33:32 +0200] rev 4582
merge with main
Brendan Cully <brendan@kublai.com> [Wed, 13 Jun 2007 19:11:20 -0700] rev 4581
Merge with crew
Brendan Cully <brendan@kublai.com> [Wed, 13 Jun 2007 19:05:20 -0700] rev 4580
extensions: fix load of module/__init__.py on OS X
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 13 Jun 2007 21:39:45 -0300] rev 4579
localrepo.status: only append stuff to the clean list if list_clean is true
This is consistent with dirstate.status.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 13 Jun 2007 21:39:45 -0300] rev 4578
mq: reduce matcher abuse
The match function should match only the files we're interested in.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 13 Jun 2007 19:15:58 -0300] rev 4577
commands.remove: don't use the unknown list
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 13 Jun 2007 19:15:58 -0300] rev 4576
commands.commit: don't use the unknown list
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 13 Jun 2007 19:15:58 -0300] rev 4575
localrepo.add: avoid some stats
There's still an extra lstat done by dirstate.update.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 13 Jun 2007 19:15:58 -0300] rev 4574
revert: use util.lexists
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 13 Jun 2007 19:15:58 -0300] rev 4573
addremove: use util.lexists
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 13 Jun 2007 19:15:58 -0300] rev 4572
commands.commit: symlinks are supported
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 13 Jun 2007 19:15:58 -0300] rev 4571
mq: grab locks before starting a transaction
Brendan Cully <brendan@kublai.com> [Wed, 13 Jun 2007 13:50:29 -0700] rev 4570
Merge with crew
Brendan Cully <brendan@kublai.com> [Wed, 13 Jun 2007 13:46:40 -0700] rev 4569
extensions: load modules in module/__init__.py form.
For example, convert=/path/to/convert now works.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Wed, 13 Jun 2007 15:02:09 +0300] rev 4568
test-patchbomb: sed -e may not work with extended regexps
Non-GNU versions of the sed(1) utility (i.e. on Solaris or BSD)
may not support extended regexps (i.e. including \| branches),
or may need a special option to enable it (like -E instead of -e).
Expand the sed RE in tests/test-patchbomb to fix running this
test on FreeBSD and Solaris.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 13 Jun 2007 08:24:40 +0200] rev 4567
Correct tests/test-patchbomb* files:
mv test-patchbomb test-patchbomb.out
hg revert -r 1cf908c00479 test-patchbomb
Bryan O'Sullivan <bos@serpentine.com> [Tue, 12 Jun 2007 14:52:34 -0700] rev 4566
patchbomb: add --date option
Bryan O'Sullivan <bos@serpentine.com> [Tue, 12 Jun 2007 14:44:47 -0700] rev 4565
Don't validate email config if we're not sending email.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 12 Jun 2007 14:39:36 -0700] rev 4564
patchbomb: 0c61124ad877 moved setremoteconfig into cmdutil
Brendan Cully <brendan@kublai.com> [Tue, 12 Jun 2007 13:21:42 -0700] rev 4563
dispatch: restore a dropped shlex import
Add test-dispatch as a place for command parsing and dispatch tests.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 12 Jun 2007 18:55:47 +0200] rev 4562
merge with main
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 12 Jun 2007 17:39:57 +0200] rev 4561
Revive commands.dispatch as a simple way to call hg from other pythons scripts.
This was already used by hg-ssh and others and is really convenient if you
just want a native equivalent of calling the command line version.
Matt Mackall <mpm@selenic.com> [Wed, 13 Jun 2007 13:15:53 -0500] rev 4560
extensions: fix lookup of hgext.foo modules
Matt Mackall <mpm@selenic.com> [Wed, 13 Jun 2007 13:15:51 -0500] rev 4559
localrepo: demand-load changeset, manifest, and dirstate
Matt Mackall <mpm@selenic.com> [Tue, 12 Jun 2007 10:34:54 -0500] rev 4558
extensions: add missing sys import
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4557
dispatch: accept an abbreviation of --repository
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4556
dispatch: move findrepo to cmdutil
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4555
localrepo: don't search from path
All current callers already pass in the repo root.
This normalizes things a bit. Now all repo types take a direct path to
repo root and only the command line interface (or the dispatcher)
searches from the current directory.
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4554
dispatch: use the repo path found by early parsing
This lets us simplify things a bit.
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4553
dispatch: parse and apply -R early
This allows us to use extensions specified in .hg/hgrc. Unfortunately,
this requires us to parse that file twice, but performance impact on
the version command appears to be less than 1%.
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4552
dispatch: parse and apply cwd opt early
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4551
dispatch: rename variables after code motion
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4550
dispatch: hoist debugging hook to runcatch
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4549
dispatch: move dispatching code to cmdutil
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4548
dispatch: move runcommand to cmdutil
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4547
dispatch: pull final command execution into its own function
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:23 -0500] rev 4546
dispatch: reduce nesting by moving parsing exceptions
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:23 -0500] rev 4545
dispatch: move signal and exception handling to its own function
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:23 -0500] rev 4544
Create a separate module for managing extensions
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:23 -0500] rev 4543
extensions: separate function for loading single extensions
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:23 -0500] rev 4542
dispatch: reorder functions
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:23 -0500] rev 4541
localrepo: break out the repo-finding walk into its own function
Brendan Cully <brendan@kublai.com> [Mon, 11 Jun 2007 12:14:31 -0700] rev 4540
Respect locale environment variables on darwin.
In python 2.4+ on darwin, locale.getpreferredencoding() returns
mac-roman regardless of what LC_CTYPE, LANG etc are set to. This can
produce hard-to-notice conversion errors if input text is not in
mac-roman. So this patch overrides it with setlocale/getlocale if the
environment has been customized, on the assumption that the user has
done so deliberately.
Brendan Cully <brendan@kublai.com> [Mon, 11 Jun 2007 11:06:42 -0700] rev 4539
Small cleanups for the new tag code
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Fri, 01 Jun 2007 19:56:39 -0400] rev 4538
gitweb: Display branch and tag labels
Pages which display labels:
- summary
- shortlog
- changelog
- changeset
- search
Brendan Cully <brendan@kublai.com> [Sun, 10 Jun 2007 21:05:01 -0700] rev 4537
Merge with mpm
Brendan Cully <brendan@kublai.com> [Sun, 10 Jun 2007 20:08:47 -0700] rev 4536
Split convert extension into common and repository type modules
Matt Mackall <mpm@selenic.com> [Sun, 10 Jun 2007 21:16:58 -0500] rev 4535
commit: fix bug where dirstate for removed file is confused
This fixes issue586
Matt Mackall <mpm@selenic.com> [Sun, 10 Jun 2007 19:16:20 -0500] rev 4534
hg serve: don't lookup user-supplied names/addresses
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 09 Jun 2007 13:25:54 +0200] rev 4533
Removed trailing \n in calls to util.Abort()
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 09 Jun 2007 13:17:58 +0200] rev 4532
Some small cleanups for convert extension:
- repo doesn't need to be imported
- util.Abort doesn't need \n
- space after comma
- long lines
- spacing
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 09 Jun 2007 01:04:28 -0300] rev 4531
Avoid extra filelogs entries.
Right now, there are some situations in which localrepo.filecommit can
create filelog entries even though they're not needed. For example:
- permissions for a file have changed;
- qrefresh can create a filelog entry identical to its parent (see the
added test);
- convert-repo creates extra filelog entries in every merge where the
first parent has added files (for example, changeset ebebe9577a1a of
the kernel repo added extra filelog entries to files in the
arch/blackfin directory, even though the merge should only touch the
drivers/ata directory). This makes "hg log file" in a converted repo
less useful than it could be, since it may mention many merges that
don't actually touch that specific file.
They all come from the same basic problem: localrepo.commit (through
filecommit) creates new filelog entries for all files passed to it
(except for some cases during a merge).
Patch and test case provided by Benoit.
This should fix issue351.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 09 Jun 2007 01:04:28 -0300] rev 4530
Make sure the changelog mentions files whose flags changed
These changes don't actually need a new filelog entry (see next patch),
but if we don't mention the files in the changelog, it becomes much
harder to find all changesets that touch a file (not even a
"hg log --removed file" will work).
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Jun 2007 23:49:12 -0300] rev 4529
run-tests.py: set ui.slash = True
This should make things easier for pysh.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Jun 2007 23:49:12 -0300] rev 4528
test-config-case: print only the Section we're interested in.
This allows us to add additional settings to the global hgrc file
created by run-tests.py without breaking this test.