Mercurial: Graph

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