| Tue, 15 Aug 2006 11:38:07 -0700 |
Vadim Gelfer |
merge with other head by default, not tip.
|
changeset |
files
|
| Tue, 15 Aug 2006 09:37:58 -0700 |
Vadim Gelfer |
merge with mpm.
|
changeset |
files
|
| Tue, 15 Aug 2006 18:14:58 +0300 |
Giorgos Keramidas |
Tune a bit the extdiff toplevel comments/samples.
|
changeset |
files
|
| Tue, 15 Aug 2006 16:04:47 +0200 |
Thomas Arendsen Hein |
Fixed test-extdiff.
|
changeset |
files
|
| Tue, 15 Aug 2006 00:03:48 -0700 |
Brendan Cully |
A fix for --prune.
|
changeset |
files
|
| Tue, 15 Aug 2006 11:47:17 +0200 |
Thomas Arendsen Hein |
Adjusted test to changed help output.
|
changeset |
files
|
| Tue, 15 Aug 2006 11:22:29 +0200 |
Thomas Arendsen Hein |
merge with jeffpc
|
changeset |
files
|
| Tue, 15 Aug 2006 05:12:27 -0400 |
Josef "Jeff" Sipek |
Use demandload in hgk
|
changeset |
files
|
| Mon, 14 Aug 2006 22:48:03 -0700 |
Brendan Cully |
Add diff --git option
|
changeset |
files
|
| Mon, 14 Aug 2006 15:51:35 -0700 |
Vadim Gelfer |
extdiff: fix bugs. add test.
|
changeset |
files
|
| Mon, 14 Aug 2006 11:41:08 -0700 |
Brendan Cully |
Allow qdel to delete multiple patches.
|
changeset |
files
|
| Mon, 14 Aug 2006 11:24:19 -0700 |
Brendan Cully |
Replace qdel/qfold -f option with -k/--keep.
|
changeset |
files
|
| Mon, 14 Aug 2006 11:10:21 -0700 |
Brendan Cully |
Properly shell-quote arguments in extdiff
|
changeset |
files
|
| Mon, 14 Aug 2006 11:07:15 -0700 |
Brendan Cully |
Update extdiff for recent refactoring
|
changeset |
files
|
| Mon, 14 Aug 2006 10:27:02 -0700 |
Brendan Cully |
Test for log --prune.
|
changeset |
files
|
| Mon, 14 Aug 2006 16:06:37 +0300 |
Giorgos Keramidas |
hgweb: partially revert 4ec58b157265
|
changeset |
files
|
| Tue, 15 Aug 2006 23:17:06 -0500 |
Matt Mackall |
merge: consolidate dirstate updates
|
changeset |
files
|
| Tue, 15 Aug 2006 22:46:35 -0500 |
Matt Mackall |
merge: use file size stored in revlog index
|
changeset |
files
|
| Tue, 15 Aug 2006 18:30:21 -0500 |
Matt Mackall |
merge: move forgets to the apply stage
|
changeset |
files
|
| Tue, 15 Aug 2006 18:12:36 -0500 |
Matt Mackall |
trivial bool() cleanup
|
changeset |
files
|
| Tue, 15 Aug 2006 16:28:00 -0500 |
Matt Mackall |
filelog.cmp: return 0 for equality
|
changeset |
files
|
| Tue, 15 Aug 2006 16:27:19 -0500 |
Matt Mackall |
merge: hoist some working manifest logic out of merge loop
|
changeset |
files
|
| Tue, 15 Aug 2006 16:12:51 -0500 |
Matt Mackall |
merge: working manifest new/changed
|
changeset |
files
|
| Tue, 15 Aug 2006 15:58:10 -0500 |
Matt Mackall |
merge: factor out exec bit merge function
|
changeset |
files
|
| Tue, 15 Aug 2006 15:45:45 -0500 |
Matt Mackall |
Use revlog hash comparison technique in merge
|
changeset |
files
|
| Tue, 15 Aug 2006 14:18:13 -0500 |
Matt Mackall |
Move cmp bits from filelog to revlog
|
changeset |
files
|
| Tue, 15 Aug 2006 14:06:50 -0500 |
Matt Mackall |
Move ui.sendmail to mail.connect/sendmail
|
changeset |
files
|
| Tue, 15 Aug 2006 11:34:08 -0500 |
Matt Mackall |
Move ui.diffopts to patch.diffopts where it belongs
|
changeset |
files
|
| Mon, 14 Aug 2006 15:07:00 -0500 |
Matt Mackall |
filelog: add hash-based comparisons
|
changeset |
files
|
| Mon, 14 Aug 2006 14:42:15 -0500 |
Matt Mackall |
Merge with crew
|
changeset |
files
|
| Sun, 13 Aug 2006 17:03:33 -0700 |
Vadim Gelfer |
cmdutil.matchpats: allow include/exclude to be optional.
|
changeset |
files
|
| Sun, 13 Aug 2006 17:03:03 -0700 |
Vadim Gelfer |
add default values to arguments of walk etc.
|
changeset |
files
|
| Sun, 13 Aug 2006 16:57:45 -0700 |
Vadim Gelfer |
move commands.addremove_lock to cmdutil.addremove
|
changeset |
files
|
| Sun, 13 Aug 2006 16:11:22 -0700 |
Vadim Gelfer |
move walk and matchpats from commands to cmdutil.
|
changeset |
files
|
| Sun, 13 Aug 2006 15:24:30 -0700 |
Vadim Gelfer |
fix patch.patch.filterfiles.
|
changeset |
files
|
| Sun, 13 Aug 2006 15:03:48 -0700 |
Vadim Gelfer |
make test-diff-subdir executable.
|
changeset |
files
|
| Sun, 13 Aug 2006 23:00:18 +0300 |
Giorgos Keramidas |
tests: new test for hg diff of a subdirectory only
|
changeset |
files
|
| Sun, 13 Aug 2006 18:35:24 +0300 |
Giorgos Keramidas |
Make clear that hg pull -r REV pulls "up to" a revision.
|
changeset |
files
|
| Sun, 13 Aug 2006 20:21:13 +0300 |
Giorgos Keramidas |
Use cached hg-root-dir instead of rediscovering
|
changeset |
files
|
| Sun, 13 Aug 2006 18:01:44 +0300 |
Giorgos Keramidas |
hgweb: repo.changes() is now called repo.status()
|
changeset |
files
|
| Sat, 12 Aug 2006 16:40:12 -0700 |
Vadim Gelfer |
remove localrepository.changes.
|
changeset |
files
|
| Sat, 12 Aug 2006 16:13:27 -0700 |
Vadim Gelfer |
refactor text diff/patch code.
|
changeset |
files
|
| Sat, 12 Aug 2006 16:05:09 -0700 |
Vadim Gelfer |
merge.
|
changeset |
files
|
| Sat, 12 Aug 2006 16:04:49 -0700 |
Vadim Gelfer |
manifest.execf is now a function.
|
changeset |
files
|
| Sat, 12 Aug 2006 15:43:38 -0700 |
Vadim Gelfer |
merge.
|
changeset |
files
|
| Sat, 12 Aug 2006 15:01:46 -0700 |
Brendan Cully |
grep: add --follow support.
|
changeset |
files
|
| Sat, 12 Aug 2006 13:51:14 -0700 |
Brendan Cully |
grep: display correct user/revision for --all in reverse.
|
changeset |
files
|
| Sat, 12 Aug 2006 15:41:26 -0700 |
Vadim Gelfer |
util: qualify name properly.
|
changeset |
files
|
| Sat, 12 Aug 2006 14:15:23 -0700 |
Vadim Gelfer |
mq: demandload more
|
changeset |
files
|
| Sat, 12 Aug 2006 13:16:48 -0700 |
Vadim Gelfer |
commands.import: refactor patch parsing into patch.extract.
|
changeset |
files
|
| Sat, 12 Aug 2006 12:47:18 -0700 |
Vadim Gelfer |
merge git patch code.
|
changeset |
files
|
| Fri, 11 Aug 2006 16:56:31 -0700 |
Brendan Cully |
Tests for git import
|
changeset |
files
|
| Fri, 11 Aug 2006 16:55:48 -0700 |
Brendan Cully |
Remove debugging line
|
changeset |
files
|
| Fri, 11 Aug 2006 16:30:24 -0700 |
Brendan Cully |
Fix bad merge with crew
|
changeset |
files
|
| Fri, 11 Aug 2006 15:50:16 -0700 |
Brendan Cully |
Move patch-related code into its own module.
|
changeset |
files
|
| Fri, 11 Aug 2006 15:50:07 -0700 |
Brendan Cully |
Teach import to understand git diff extensions.
|
changeset |
files
|
| Sat, 12 Aug 2006 12:30:02 -0700 |
Vadim Gelfer |
update copyrights.
|
changeset |
files
|
| Sat, 12 Aug 2006 12:12:23 -0700 |
Vadim Gelfer |
merge.
|
changeset |
files
|
| Sat, 12 Aug 2006 08:53:23 -0300 |
Alexis S. L. Carvalho |
Fix some bugs introduced during the manifest refactoring
|
changeset |
files
|
| Sat, 12 Aug 2006 09:24:04 -0300 |
Alexis S. L. Carvalho |
Fix "hg qnew -f foo" without -m
|
changeset |
files
|
| Sat, 12 Aug 2006 11:53:12 -0700 |
Vadim Gelfer |
merge with mpm.
|
changeset |
files
|
| Fri, 11 Aug 2006 14:50:41 -0700 |
Vadim Gelfer |
import: get lock and wlock one time
|
changeset |
files
|
| Fri, 11 Aug 2006 09:11:54 +0200 |
Thomas Arendsen Hein |
Adjusted documentation for hgrc's "[smtp] host" for change in 9f745d3675d4.
|
changeset |
files
|
| Thu, 10 Aug 2006 17:37:57 -0700 |
Vadim Gelfer |
fix test output
|
changeset |
files
|
| Thu, 10 Aug 2006 17:33:08 -0700 |
Vadim Gelfer |
mq: only add mq attribute to local repo
|
changeset |
files
|
| Thu, 10 Aug 2006 17:18:55 -0700 |
Vadim Gelfer |
mq: apply patch is any posative guard matches
|
changeset |
files
|
| Thu, 10 Aug 2006 17:02:11 -0700 |
Vadim Gelfer |
fetch: fix test fail
|
changeset |
files
|
| Thu, 10 Aug 2006 16:10:59 -0700 |
Vadim Gelfer |
mq: do not allow to push from repo with patches applied
|
changeset |
files
|
| Thu, 10 Aug 2006 15:44:05 -0700 |
Vadim Gelfer |
call reposetup functions of extension modules whenever repo created
|
changeset |
files
|
| Thu, 10 Aug 2006 15:02:18 -0700 |
Vadim Gelfer |
mq: test commit in repo with patches applied
|
changeset |
files
|
| Thu, 10 Aug 2006 11:18:48 -0700 |
Brendan Cully |
Disallow commit over an applied mq patch.
|
changeset |
files
|
| Thu, 10 Aug 2006 14:58:10 -0700 |
Vadim Gelfer |
qselect: add --pop, --reapply options
|
changeset |
files
|
| Wed, 09 Aug 2006 12:05:40 -0700 |
Danek Duvall |
Fix some tests for portability.
|
changeset |
files
|
| Mon, 14 Aug 2006 14:14:08 -0500 |
Matt Mackall |
merge: minor simplification
|
changeset |
files
|
| Fri, 11 Aug 2006 11:00:38 -0500 |
Matt Mackall |
Remove manifest.readflags
|
changeset |
files
|
| Fri, 11 Aug 2006 10:57:42 -0500 |
Matt Mackall |
Change remaining users of manifest flags
|
changeset |
files
|
| Thu, 10 Aug 2006 22:38:56 -0500 |
Matt Mackall |
Switch to simpler manifestdict
|
changeset |
files
|
| Wed, 09 Aug 2006 22:07:13 -0500 |
Matt Mackall |
Merge: use single objects for tracking manifests
|
changeset |
files
|
| Wed, 09 Aug 2006 17:11:01 -0500 |
Matt Mackall |
Merge: save away mode bit so that we don't need manifest later
|
changeset |
files
|
| Wed, 09 Aug 2006 15:03:46 -0500 |
Matt Mackall |
Merge manifest refactor work
|
changeset |
files
|
| Wed, 09 Aug 2006 14:53:03 -0500 |
Matt Mackall |
Combine manifest dict and flags dict into a single object
|
changeset |
files
|
| Wed, 19 Jul 2006 19:11:50 -0500 |
Matt Mackall |
manifestflags: eliminate remaining users of direct dict access
|
changeset |
files
|
| Sun, 16 Jul 2006 03:22:05 -0500 |
Matt Mackall |
Use strings for manifestflags to allow storing multiple flags
|
changeset |
files
|
| Sun, 16 Jul 2006 03:14:17 -0500 |
Matt Mackall |
Start using manifestflags methods
|
changeset |
files
|
| Sun, 16 Jul 2006 02:59:20 -0500 |
Matt Mackall |
Add manifestflags class
|
changeset |
files
|
| Wed, 09 Aug 2006 13:55:18 -0500 |
Matt Mackall |
Merge with crew, fix most tests
|
changeset |
files
|
| Wed, 09 Aug 2006 09:38:11 -0700 |
Vadim Gelfer |
mq: make guards more strict, add tests
|
changeset |
files
|
| Tue, 08 Aug 2006 17:11:36 -0700 |
Vadim Gelfer |
mq: drop qversion command
|
changeset |
files
|
| Tue, 08 Aug 2006 17:08:59 -0700 |
Vadim Gelfer |
fetch: hold lock and wlock across all operations
|
changeset |
files
|
| Wed, 09 Aug 2006 02:04:49 -0700 |
Vadim Gelfer |
tests: forgot to add test-mq-guards.out
|
changeset |
files
|
| Tue, 08 Aug 2006 16:40:08 -0700 |
Vadim Gelfer |
fetch: lock repo across pull and commit
|
changeset |
files
|
| Tue, 08 Aug 2006 16:37:41 -0700 |
Vadim Gelfer |
fetch: drop commands.doupdate
|
changeset |
files
|
| Tue, 08 Aug 2006 16:23:02 -0700 |
Vadim Gelfer |
test-fetch: make output stable
|
changeset |
files
|
| Tue, 08 Aug 2006 16:09:26 -0700 |
Vadim Gelfer |
fetch: fix breakage from mpm.
|
changeset |
files
|
| Tue, 08 Aug 2006 21:42:50 -0700 |
Vadim Gelfer |
mq: new commands qselect, qguard
|
changeset |
files
|
| Tue, 08 Aug 2006 18:14:03 -0700 |
Vadim Gelfer |
fix permission of test-mq-qsave
|
changeset |
files
|
| Tue, 08 Aug 2006 18:12:48 -0700 |
Vadim Gelfer |
mq: add join method
|
changeset |
files
|
| Mon, 07 Aug 2006 14:59:32 -0700 |
Brendan Cully |
Make mq camelcase consistent with the rest of hg.
|
changeset |
files
|
| Mon, 07 Aug 2006 14:48:24 -0700 |
Brendan Cully |
Add basic qsave/qrestore test.
|
changeset |
files
|
| Mon, 07 Aug 2006 14:48:18 -0700 |
Brendan Cully |
Update qsave to use StatusEntry; don't throw exception on bad status lines.
|
changeset |
files
|
| Tue, 08 Aug 2006 10:56:48 -0500 |
Matt Mackall |
Merge: combine force and forcemerge arguments
|
changeset |
files
|
| Tue, 08 Aug 2006 10:35:19 -0500 |
Matt Mackall |
Merge: move most tests to the beginning
|
changeset |
files
|
| Tue, 08 Aug 2006 09:26:00 -0500 |
Matt Mackall |
Merge: refactor err and failedmerge -> unresolved
|
changeset |
files
|
| Tue, 08 Aug 2006 09:19:20 -0500 |
Matt Mackall |
Refactor update locking slightly
|
changeset |
files
|
| Tue, 08 Aug 2006 09:11:16 -0500 |
Matt Mackall |
Merge: combine choose and moddirstate to partial
|
changeset |
files
|
| Mon, 07 Aug 2006 23:53:04 -0500 |
Matt Mackall |
Rename merge.allow -> merge.branchmerge
|
changeset |
files
|
| Mon, 07 Aug 2006 23:18:16 -0500 |
Matt Mackall |
Use demandload @ syntax
|
changeset |
files
|
| Mon, 07 Aug 2006 22:54:33 -0500 |
Matt Mackall |
Introduce update helper functions: update, merge, clean, and revert
|
changeset |
files
|
| Mon, 07 Aug 2006 22:35:36 -0500 |
Matt Mackall |
Teach demandload how to import as
|
changeset |
files
|
| Mon, 07 Aug 2006 20:54:03 -0500 |
Matt Mackall |
Factor doupdate into _lookup + hg.update
|
changeset |
files
|
| Mon, 07 Aug 2006 17:26:09 -0500 |
Matt Mackall |
Fix extensions for merge change
|
changeset |
files
|
| Mon, 07 Aug 2006 14:12:03 -0700 |
Brendan Cully |
Update mq to use new logmessage arglist from 2794:bd8a9a94139f
|
changeset |
files
|
| Mon, 07 Aug 2006 16:47:06 -0500 |
Matt Mackall |
Merge with crew
|
changeset |
files
|
| Mon, 07 Aug 2006 19:08:55 -0700 |
Vadim Gelfer |
fetch: add missing import.
|
changeset |
files
|
| Mon, 07 Aug 2006 17:33:14 -0700 |
Vadim Gelfer |
fetch: do not fetch if working dir modified
|
changeset |
files
|
| Mon, 07 Aug 2006 17:27:38 -0700 |
Vadim Gelfer |
new extension: fetch -> combine pull and merge/update
|
changeset |
files
|
| Mon, 07 Aug 2006 17:23:04 -0700 |
Vadim Gelfer |
commands.logmessage: simplify calling.
|
changeset |
files
|
| Mon, 07 Aug 2006 17:22:17 -0700 |
Vadim Gelfer |
localrepo.update: allow to suppress commit reminder.
|
changeset |
files
|
| Sun, 06 Aug 2006 17:27:05 +0200 |
Benoit Boissinot |
mq: unused variables, improper usage of 'is [not]', undefined variable
|
changeset |
files
|
| Sun, 06 Aug 2006 17:24:13 +0200 |
Benoit Boissinot |
mq: codingstyle
|
changeset |
files
|