Tue, 02 Dec 2014 22:42:41 -0500 |
Matt Harbison |
tests: drop unnecessary glob that causes a warning on Windows
|
Wed, 03 Dec 2014 10:01:24 -0800 |
Martin von Zweigbergk |
merge: add test with conflicting file and remote directory rename
|
Wed, 03 Dec 2014 15:03:29 -0800 |
Martin von Zweigbergk |
graft: use a real conflict for the tests
|
Wed, 03 Dec 2014 14:33:29 -0800 |
John Coomes |
add: use lexists so that broken symbolic links are added
|
Tue, 02 Dec 2014 05:12:59 +0100 |
Mads Kiilerich |
rebase: avoid redundant repo[rev].rev() - just keep working in rev space
|
Tue, 02 Dec 2014 05:12:59 +0100 |
Mads Kiilerich |
rebase: always store rev in state, also when collapsing
|
Tue, 02 Dec 2014 05:12:53 +0100 |
Mads Kiilerich |
rebase: clarify naming of variables holding node hashes - don't call them rev
|
Thu, 27 Nov 2014 00:24:25 -0800 |
Ryan McElroy |
bookmarks: factor out bookmark file opening for easier extensibility
|
Tue, 02 Dec 2014 17:19:20 -0600 |
Matt Mackall |
merge with stable
|
Tue, 18 Nov 2014 22:18:05 -0800 |
Siddharth Agarwal |
diff: explicitly honor all diffopts
|
Tue, 18 Nov 2014 22:16:46 -0800 |
Siddharth Agarwal |
annotate: explicitly only honor whitespace diffopts
|
Tue, 18 Nov 2014 21:47:47 -0800 |
Siddharth Agarwal |
notify: explicitly honor all diffopts
|
Tue, 18 Nov 2014 22:13:05 -0800 |
Siddharth Agarwal |
jsonchangeset: don't honor whitespace and format-changing diffopts
|
Tue, 18 Nov 2014 21:49:05 -0800 |
Siddharth Agarwal |
transplant: don't honor whitespace and format-changing diffopts
|
Tue, 18 Nov 2014 21:38:19 -0800 |
Siddharth Agarwal |
hgk: don't honor whitespace and format-changing diffopts
|
Tue, 18 Nov 2014 17:36:24 -0800 |
Siddharth Agarwal |
patchbomb: don't honor whitespace and format-changing diffopts (BC)
|
Wed, 26 Nov 2014 11:45:21 -0800 |
Martin von Zweigbergk |
merge: add more thorough tests for --force
|
Wed, 26 Nov 2014 10:25:27 -0800 |
Martin von Zweigbergk |
merge: display modify/delete conflict prompts in sorted order
|
Sun, 09 Nov 2014 00:10:29 -0800 |
Martin von Zweigbergk |
generate-working-copy-states: accept depth arguments on command line
|
Sat, 08 Nov 2014 23:37:54 -0800 |
Martin von Zweigbergk |
generate-working-copy-states: generalize for depth
|
Sat, 29 Nov 2014 14:39:33 -0800 |
Martin von Zweigbergk |
generate-working-copy-states: make 'tracked' a string
|
Tue, 02 Dec 2014 13:28:07 -0800 |
Martin von Zweigbergk |
merge: demonstrate that directory renames can lose local file content
|
Fri, 28 Nov 2014 03:09:19 +0100 |
Mads Kiilerich |
mq: drop updateheader - inserthgheader and insertplainheader is enough
|
Fri, 28 Nov 2014 03:09:06 +0100 |
Mads Kiilerich |
mq: smarter handling of plain headers
|
Sun, 30 Nov 2014 23:30:31 -0500 |
Matt Harbison |
largefiles: drop the override for 'fetch'
|
Tue, 02 Dec 2014 11:06:38 -0800 |
Pierre-Yves David |
rebase: ignore negative state when updating back to original wc parent
stable
|
Fri, 21 Nov 2014 15:50:38 -0800 |
Eric Sumner |
bundle2-push: provide transaction to reply unbundler
|
Mon, 24 Nov 2014 16:04:44 -0800 |
Eric Sumner |
bundle2.processbundle: let callers request default behavior
|
Fri, 21 Nov 2014 15:06:38 -0800 |
Eric Sumner |
push: elevate phase transaction to cover entire operation
|
Fri, 21 Nov 2014 14:32:57 -0800 |
Eric Sumner |
pull: extract transaction logic into separate object
|
Tue, 18 Nov 2014 20:00:37 -0800 |
Siddharth Agarwal |
record: don't honor format-changing diffopts (issue4459)
|
Tue, 18 Nov 2014 17:22:03 -0800 |
Siddharth Agarwal |
patch.difffeatureopts: add a feature for format-changing diffopts
|
Tue, 18 Nov 2014 17:09:26 -0800 |
Siddharth Agarwal |
patch.difffeatureopts: add a feature for whitespace diffopts
|
Tue, 18 Nov 2014 17:10:14 -0800 |
Siddharth Agarwal |
patch.difffeatureopts: add a feature for diff.git
|
Tue, 18 Nov 2014 21:43:38 -0800 |
Siddharth Agarwal |
patch: rename diffopts to diffallopts
|
Tue, 18 Nov 2014 16:53:22 -0800 |
Siddharth Agarwal |
patch: add a new function to initialize diffopts by feature
|
Tue, 18 Nov 2014 16:00:54 -0800 |
Siddharth Agarwal |
patch.diffopts: use a dict for initialization
|
Fri, 21 Nov 2014 22:24:45 -0500 |
Matt Harbison |
largefiles: split the creation of a normal matcher out of its install method
|
Mon, 01 Dec 2014 21:48:32 -0800 |
Martin von Zweigbergk |
addremove: print relative paths when called with -I/-X (BC)
|
Mon, 01 Dec 2014 19:34:11 -0600 |
Matt Mackall |
merge with stable
|
Mon, 01 Dec 2014 18:51:10 -0600 |
Matt Mackall |
merge with i18n
stable
|
Mon, 01 Dec 2014 11:21:30 -0200 |
Wagner Bruna |
i18n-pt_BR: synchronized with 3bd577a3283e
stable
|
Sat, 29 Nov 2014 14:32:12 +0900 |
FUJIWARA Katsunori |
i18n-ja: synchronized with edf29f9c15f0
stable
|
Mon, 01 Dec 2014 18:39:19 -0600 |
Matt Mackall |
Added signature for changeset 902554884335
stable
|
Mon, 01 Dec 2014 18:39:14 -0600 |
Matt Mackall |
Added tag 3.2.2 for changeset 902554884335
stable
|
Mon, 01 Dec 2014 02:30:21 +0100 |
Mads Kiilerich |
merge: before cd/dc prompt, check that changed side really changed
stable 3.2.2
|
Mon, 01 Dec 2014 02:11:29 +0100 |
Mads Kiilerich |
largefiles: don't show largefile/normal prompts if one side is unchanged
stable
|
Mon, 01 Dec 2014 02:11:17 +0100 |
Mads Kiilerich |
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
stable
|
Mon, 01 Dec 2014 02:10:57 +0100 |
Mads Kiilerich |
tests: clean-up of largefiles tests in test-issue3084.t
stable
|
Sat, 29 Nov 2014 19:17:47 -0800 |
Pierre-Yves David |
pushkey: gracefully handle prepushkey hook failure (issue4455)
stable
|
Sat, 29 Nov 2014 19:13:35 -0800 |
Pierre-Yves David |
hook: raise a more specialized HookAbort exception when a hook fails
stable
|
Mon, 01 Dec 2014 15:04:34 -0600 |
Matt Mackall |
help: fix typo in files help
stable
|
Mon, 01 Dec 2014 05:18:12 -0800 |
Pierre-Yves David |
revset: fix first and last for generatorset (issue4465)
stable
|
Fri, 28 Nov 2014 02:57:33 +0100 |
Mads Kiilerich |
mq: fix update of headers that occur in the "wrong" order
stable
|
Fri, 28 Nov 2014 20:16:15 +0100 |
Mathias De Maré |
subrepo: add status support for ignored files in git subrepos
|
Wed, 26 Nov 2014 15:37:01 -0800 |
Pierre-Yves David |
manifest: document the extra letter in working copy manifest node
|
Fri, 28 Nov 2014 10:59:02 -0800 |
Gregory Szorc |
hgweb: send proper HTTP response after uncaught exception
stable
|
Sun, 30 Nov 2014 20:06:53 +0100 |
Mads Kiilerich |
tests: test rebase of merge of target ancestors
|
Sun, 30 Nov 2014 19:36:03 +0100 |
Mads Kiilerich |
tests: test coverage of parent order with p1 outside rebase set
|
Sun, 30 Nov 2014 19:35:54 +0100 |
Mads Kiilerich |
tests: add test for rebasing merges with ancestors of the rebase destination
|
Sun, 30 Nov 2014 19:26:53 +0100 |
Mads Kiilerich |
merge: 0 is a valid ancestor different from None
|
Thu, 27 Nov 2014 12:25:01 -0600 |
Matt Mackall |
merge with stable
|
Tue, 25 Nov 2014 19:40:54 -0800 |
Pierre-Yves David |
revert: look for copy information for all local modifications
stable
|
Mon, 24 Nov 2014 18:42:56 -0800 |
Pierre-Yves David |
rename: properly report removed and added file as modified (issue4458)
stable
|
Wed, 26 Nov 2014 14:54:16 -0800 |
Pierre-Yves David |
manifest: fix a bug where working copy file 'add' mark was buggy
stable
|
Wed, 26 Nov 2014 17:22:09 +0300 |
anatoly techtonik |
merge: be precise about what merged into what in short desc
stable
|
Tue, 11 Nov 2014 20:32:10 -0800 |
Gregory Szorc |
docker: add Docker files for running an Apache mod_wsgi server
|
Mon, 24 Nov 2014 16:17:02 -0800 |
Martin von Zweigbergk |
merge: use None as filename for base in 'both created' conflicts
|
Mon, 24 Nov 2014 16:42:36 -0800 |
Martin von Zweigbergk |
merge: break out "both renamed a -> b" case
|
Mon, 24 Nov 2014 16:16:34 -0800 |
Martin von Zweigbergk |
merge: separate out "both created" cases
|
Mon, 24 Nov 2014 16:11:22 -0800 |
Martin von Zweigbergk |
merge: indent to prepare for next patch
|
Tue, 25 Nov 2014 17:30:05 -0600 |
Matt Mackall |
merge with stable
|
Tue, 25 Nov 2014 02:31:52 -0600 |
David Eckhardt |
factotum: convert Plan 9 quoted string to Python string
|
Tue, 25 Nov 2014 02:27:31 -0600 |
Jeff Sickel |
plan9: setup check for current python build
|
Wed, 19 Nov 2014 22:27:55 -0500 |
Matt Harbison |
add: check for the existence of a file matched inexactly before adding it
|
Thu, 20 Nov 2014 22:33:40 -0500 |
Matt Harbison |
tests: choose the proper environment variable style for the platform
|
Thu, 20 Nov 2014 20:07:34 -0500 |
Matt Harbison |
tests: fix another multi-statement hook for Windows
|
Wed, 19 Nov 2014 23:41:40 -0500 |
Matt Harbison |
run-tests: set a default largefiles usercache in the default hgrc file
|
Mon, 24 Nov 2014 09:50:27 -0800 |
Martin von Zweigbergk |
merge: remove obsolete check for untracked files in 'dm' action
|
Sun, 23 Nov 2014 23:10:34 -0800 |
Martin von Zweigbergk |
merge: remove dead assignment in applyupdates()
|
Fri, 21 Nov 2014 13:06:04 -0800 |
Martin von Zweigbergk |
merge: move calculateupdates() before applyupdated()
|
Mon, 24 Nov 2014 11:28:46 -0800 |
Martin von Zweigbergk |
merge: remove unused variables from _checkcollision()
|
Tue, 25 Nov 2014 18:37:28 +0900 |
FUJIWARA Katsunori |
largefiles: avoid exec-bit examination on the platform being unaware of it
stable
|
Sat, 22 Nov 2014 17:09:04 -0600 |
Matt Mackall |
merge with stable
|
Thu, 20 Nov 2014 16:30:57 -0800 |
Durham Goode |
changegroup: fix file linkrevs during reorders (issue4462)
stable
|
Thu, 20 Nov 2014 16:39:32 -0800 |
Martin von Zweigbergk |
merge: consistently use single quotes for non-user-facing strings
|
Thu, 13 Nov 2014 11:12:47 +0000 |
Pierre-Yves David |
localrepo: add a currenttransaction method
|
Thu, 13 Nov 2014 11:11:17 +0000 |
Pierre-Yves David |
repoview: extract actual hidden cache writing in its own function
|
Fri, 21 Nov 2014 13:58:49 +0800 |
Anton Shestakov |
templates: fix broken "less" & "more" links in paper style (issue4460)
stable
|
Wed, 19 Nov 2014 01:36:17 +0000 |
Pierre-Yves David |
push: stop independent usage of bundle2 in syncphase (issue4454)
stable
|
Wed, 19 Nov 2014 23:15:07 -0800 |
Martin von Zweigbergk |
dirstate: speed up repeated missing directory checks
|
Wed, 19 Nov 2014 17:07:27 -0800 |
Martin von Zweigbergk |
revert: access status fields by name rather than index
|
Wed, 19 Nov 2014 18:35:14 +0900 |
FUJIWARA Katsunori |
subrepo: remove "_getstorehashcachepath" referred by no other code paths
|
Wed, 19 Nov 2014 18:35:14 +0900 |
FUJIWARA Katsunori |
subrepo: replace direct file APIs around "writelines" by "vfs.writelines"
|
Wed, 19 Nov 2014 18:35:14 +0900 |
FUJIWARA Katsunori |
vfs: add "writelines"
|
Wed, 19 Nov 2014 18:35:14 +0900 |
FUJIWARA Katsunori |
vfs: add "notindexed" argument to invoke "ensuredir" with it in write mode
|
Wed, 19 Nov 2014 18:35:14 +0900 |
FUJIWARA Katsunori |
subrepo: replace direct file APIs around "readlines" by "vfs.tryreadlines"
|
Wed, 19 Nov 2014 18:35:14 +0900 |
FUJIWARA Katsunori |
vfs: add "readlines" and "tryreadlines"
|
Wed, 19 Nov 2014 18:35:14 +0900 |
FUJIWARA Katsunori |
subrepo: add "_cachestorehashvfs" to handle cache store hash files via vfs
|
Wed, 19 Nov 2014 18:35:14 +0900 |
FUJIWARA Katsunori |
subrepo: remove "_calcfilehash" referred by no other code paths
|
Wed, 19 Nov 2014 18:35:14 +0900 |
FUJIWARA Katsunori |
subrepo: replace "_calcfilehash" invocation by "vfs.tryread"
|
Wed, 19 Nov 2014 18:35:14 +0900 |
FUJIWARA Katsunori |
subrepo: replace "os.path.exists" by "exists" via wvfs of the parent
|
Wed, 19 Nov 2014 18:35:14 +0900 |
FUJIWARA Katsunori |
subrepo: avoid redundant "util.makedirs" invocation
|
Wed, 19 Nov 2014 08:50:08 -0800 |
Martin von Zweigbergk |
merge: remove confusing comment about --force
|
Fri, 17 Oct 2014 22:23:06 -0700 |
Pierre-Yves David |
phases: read pending data when appropriate
|
Sun, 28 Sep 2014 21:27:48 -0700 |
Pierre-Yves David |
bookmark: read pending data when appropriate
|
Wed, 12 Nov 2014 16:54:57 +0000 |
Pierre-Yves David |
test-bundle2: check visible data in pre/post-transaction hooks
|
Fri, 17 Oct 2014 22:19:05 -0700 |
Pierre-Yves David |
transaction: write pending generated files
|
Fri, 17 Oct 2014 21:57:32 -0700 |
Pierre-Yves David |
transaction: have _generatefile return a boolean
|
Mon, 29 Sep 2014 01:29:08 -0700 |
Pierre-Yves David |
transaction: allow generating files with a suffix
|
Wed, 19 Nov 2014 09:52:05 -0600 |
Matt Mackall |
transaction: fix some docstring grammar
|
Wed, 12 Nov 2014 14:57:41 +0000 |
Pierre-Yves David |
transaction: accept a 'location' argument for registertmp
|
Tue, 18 Nov 2014 23:51:58 -0500 |
Matt Harbison |
tests: handle differences between missing file error strings on Windows and Unix
|
Tue, 18 Nov 2014 22:02:00 -0500 |
Matt Harbison |
run-tests: don't warn on unnecessary globs mandated by check-code.py
|
Tue, 18 Nov 2014 16:14:32 -0800 |
Martin von Zweigbergk |
update: remove unnecessary check for unknown files with --check
|
Tue, 18 Nov 2014 12:29:30 -0600 |
Matt Mackall |
merge with stable
|
Sun, 16 Nov 2014 22:03:57 -0500 |
Matt Harbison |
tests: move a multi-statement debuglocks hook into a shell script for Windows
|
Sun, 16 Nov 2014 16:26:15 -0500 |
Matt Harbison |
tests: fix globs for Windows
|
Tue, 04 Nov 2014 12:46:00 -0500 |
Matt Harbison |
run-tests: include quotes in the HGEDITOR value when storing sys.executable
|
Mon, 17 Nov 2014 01:48:43 +0100 |
Mads Kiilerich |
mq: when adding headers in plain mode, separate them from message (issue4453)
stable
|