mercurial at 34566: 37 new changesets
Mercurial Commits
hg at intevation.de
Wed Oct 11 21:17:26 UTC 2017
37 new changesets in mercurial:
https://www.mercurial-scm.org/repo/hg/rev/ed5acd3fd7e1
changeset: 34530:ed5acd3fd7e1
user: Kostia Balytskyi <ikostia at fb.com>
date: Mon Oct 09 02:30:23 2017 -0700
summary: windows: add an experimental option for long paths support
https://www.mercurial-scm.org/repo/hg/rev/50788d1ae6cc
changeset: 34531:50788d1ae6cc
user: Yuya Nishihara <yuya at tcha.org>
date: Sat Oct 07 22:07:10 2017 +0900
summary: chg: just forward --time to command server
https://www.mercurial-scm.org/repo/hg/rev/b09b3eaf9c96
changeset: 34532:b09b3eaf9c96
user: Yuya Nishihara <yuya at tcha.org>
date: Mon Oct 02 06:52:10 2017 +0100
summary: py3: work around the scope of exception variable in dispatch.run()
https://www.mercurial-scm.org/repo/hg/rev/163fa0aea71e
changeset: 34533:163fa0aea71e
user: Yuya Nishihara <yuya at tcha.org>
date: Mon Oct 02 07:18:24 2017 +0100
summary: dispatch: move initialization of sys.std* files
https://www.mercurial-scm.org/repo/hg/rev/b3073e175c17
changeset: 34534:b3073e175c17
user: Yuya Nishihara <yuya at tcha.org>
date: Sat Sep 09 19:13:25 2017 +0900
summary: templater: wrap get/min/max result so map operation can apply to element
https://www.mercurial-scm.org/repo/hg/rev/78590585c0db
changeset: 34535:78590585c0db
user: Yuya Nishihara <yuya at tcha.org>
date: Sat Sep 09 19:32:56 2017 +0900
summary: templater: add dot operator to easily access a sub item
https://www.mercurial-scm.org/repo/hg/rev/4c1cfe54c08d
changeset: 34536:4c1cfe54c08d
user: Yuya Nishihara <yuya at tcha.org>
date: Mon Sep 18 23:07:17 2017 +0900
summary: templater: extend dot operator as a short for get(dict, key)
https://www.mercurial-scm.org/repo/hg/rev/8c3dd5e462cc
changeset: 34537:8c3dd5e462cc
user: Yuya Nishihara <yuya at tcha.org>
date: Mon Sep 18 23:49:05 2017 +0900
summary: templatekw: fix scope of peerpath url bound to generator
https://www.mercurial-scm.org/repo/hg/rev/ac38e889b33a
changeset: 34538:ac38e889b33a
user: Yuya Nishihara <yuya at tcha.org>
date: Mon Sep 18 23:31:01 2017 +0900
summary: templatekw: make experimental {peerpaths} return a single-level dict (BC)
https://www.mercurial-scm.org/repo/hg/rev/f30e59703d98
changeset: 34539:f30e59703d98
user: Yuya Nishihara <yuya at tcha.org>
date: Mon Sep 18 23:53:05 2017 +0900
summary: templatekw: rename peerpaths to peerurls per naming convention (BC)
https://www.mercurial-scm.org/repo/hg/rev/1c7c4445686f
changeset: 34540:1c7c4445686f
user: Yuya Nishihara <yuya at tcha.org>
date: Sat Sep 30 08:50:24 2017 +0100
summary: templatekw: get rid of temporary dicts from shownamespaces()
https://www.mercurial-scm.org/repo/hg/rev/0a0a72c043ac
changeset: 34541:0a0a72c043ac
user: Yuya Nishihara <yuya at tcha.org>
date: Sat Sep 30 08:57:50 2017 +0100
summary: templatekw: allow accessing to nested namespace item by its template name
https://www.mercurial-scm.org/repo/hg/rev/153e4e05e9b3
changeset: 34542:153e4e05e9b3
user: Yuya Nishihara <yuya at tcha.org>
date: Sun Oct 01 12:21:50 2017 +0100
summary: extdata: show debug message if external command exits with non-zero status
https://www.mercurial-scm.org/repo/hg/rev/6fad8059a970
changeset: 34543:6fad8059a970
user: Mark Thomas <mbthomas at fb.com>
date: Mon Oct 02 14:05:30 2017 -0700
summary: scmutil: handle conflicting files and dirs in origbackuppath
https://www.mercurial-scm.org/repo/hg/rev/34c8080d12ac
changeset: 34544:34c8080d12ac
user: Mark Thomas <mbthomas at fb.com>
date: Mon Oct 02 14:05:30 2017 -0700
summary: tests: add a test demonstrating basic path conflict failures
https://www.mercurial-scm.org/repo/hg/rev/1913162854f2
changeset: 34545:1913162854f2
user: Mark Thomas <mbthomas at fb.com>
date: Mon Oct 02 14:05:30 2017 -0700
summary: merge: add pathconflict merge state
https://www.mercurial-scm.org/repo/hg/rev/e4cf957bf7ce
changeset: 34546:e4cf957bf7ce
user: Mark Thomas <mbthomas at fb.com>
date: Mon Oct 02 14:05:30 2017 -0700
summary: commands: update the resolve command to handle path conflicts
https://www.mercurial-scm.org/repo/hg/rev/81aebcc73beb
changeset: 34547:81aebcc73beb
user: Mark Thomas <mbthomas at fb.com>
date: Mon Oct 02 14:05:30 2017 -0700
summary: merge: add merge action 'p' to record path conflicts during update
https://www.mercurial-scm.org/repo/hg/rev/b4955650eb57
changeset: 34548:b4955650eb57
user: Mark Thomas <mbthomas at fb.com>
date: Mon Oct 02 14:05:30 2017 -0700
summary: merge: add merge action 'pr' to rename files during update
https://www.mercurial-scm.org/repo/hg/rev/a991e1d6bc82
changeset: 34549:a991e1d6bc82
user: Mark Thomas <mbthomas at fb.com>
date: Mon Oct 02 14:05:30 2017 -0700
summary: merge: backup conflicting directories when getting files
https://www.mercurial-scm.org/repo/hg/rev/53e4bcab346b
changeset: 34550:53e4bcab346b
user: Mark Thomas <mbthomas at fb.com>
date: Mon Oct 02 14:05:30 2017 -0700
summary: merge: add _checkunknowndirs function for detecting path conflicts
https://www.mercurial-scm.org/repo/hg/rev/1609a5afc4f5
changeset: 34551:1609a5afc4f5
user: Mark Thomas <mbthomas at fb.com>
date: Mon Oct 02 14:05:30 2017 -0700
summary: merge: rename conflicts to fileconflicts in _checkunknownfiles
https://www.mercurial-scm.org/repo/hg/rev/33c8a6837181
changeset: 34552:33c8a6837181
user: Mark Thomas <mbthomas at fb.com>
date: Mon Oct 02 14:05:30 2017 -0700
summary: merge: check for path conflicts when updating (issue5628)
https://www.mercurial-scm.org/repo/hg/rev/0217d66846f7
changeset: 34553:0217d66846f7
user: Mark Thomas <mbthomas at fb.com>
date: Mon Oct 02 14:05:30 2017 -0700
summary: merge: improve error messages for path conflicts during update
https://www.mercurial-scm.org/repo/hg/rev/6f11a74d489f
changeset: 34554:6f11a74d489f
user: Mark Thomas <mbthomas at fb.com>
date: Mon Oct 02 14:05:30 2017 -0700
summary: util: add safename function for generating safe names to rename to
https://www.mercurial-scm.org/repo/hg/rev/989e884d1be9
changeset: 34555:989e884d1be9
user: Mark Thomas <mbthomas at fb.com>
date: Mon Oct 02 14:05:30 2017 -0700
summary: merge: check for path conflicts when merging (issue5628)
https://www.mercurial-scm.org/repo/hg/rev/7a8a16f8ea22
changeset: 34556:7a8a16f8ea22
user: Mark Thomas <mbthomas at fb.com>
date: Mon Oct 02 14:05:30 2017 -0700
summary: context: also consider path conflicts when clearing unknown files
https://www.mercurial-scm.org/repo/hg/rev/3b9428f4403d
changeset: 34557:3b9428f4403d
user: Mark Thomas <mbthomas at fb.com>
date: Mon Oct 02 14:05:30 2017 -0700
summary: tests: add test for path conflicts during update
https://www.mercurial-scm.org/repo/hg/rev/f71c712ebdec
changeset: 34558:f71c712ebdec
user: Mark Thomas <mbthomas at fb.com>
date: Mon Oct 02 14:05:30 2017 -0700
summary: tests: add test for path conflicts during merge
https://www.mercurial-scm.org/repo/hg/rev/eddeedbde866
changeset: 34559:eddeedbde866
user: Mark Thomas <mbthomas at fb.com>
date: Mon Oct 02 14:05:30 2017 -0700
summary: commands: tidy up merge state decoding in resolve
https://www.mercurial-scm.org/repo/hg/rev/1248aa48cac9
changeset: 34560:1248aa48cac9
user: Mark Thomas <mbthomas at fb.com>
date: Thu Oct 05 08:03:57 2017 -0700
summary: merge: improve comments in mergestate._makerecords
https://www.mercurial-scm.org/repo/hg/rev/fe6125ebdf91
changeset: 34561:fe6125ebdf91
user: Denis Laxalde <denis.laxalde at logilab.fr>
date: Tue Sep 26 18:17:47 2017 +0200
summary: patch: rename "header" variable into "hdr" in diff()
https://www.mercurial-scm.org/repo/hg/rev/c2d2e18f9700
changeset: 34562:c2d2e18f9700
user: Boris Feld <boris.feld at octobus.net>
date: Mon Oct 09 17:33:03 2017 +0200
summary: mq: use the newcommitphase utility
https://www.mercurial-scm.org/repo/hg/rev/1faa34347b24
changeset: 34563:1faa34347b24
user: Boris Feld <boris.feld at octobus.net>
date: Mon Oct 09 16:31:43 2017 +0200
summary: configitems: update default value of 'phases.new-commit'
https://www.mercurial-scm.org/repo/hg/rev/b79f59425964
changeset: 34564:b79f59425964
user: Eamonn Kent <ekent at fb.com>
date: Mon Oct 09 10:09:36 2017 -0700
summary: fsmonitor: change the distance calculation
https://www.mercurial-scm.org/repo/hg/rev/4aa57627692a
changeset: 34565:4aa57627692a
user: Eamonn Kent <ekent at fb.com>
date: Mon Oct 09 10:09:36 2017 -0700
summary: fsmonitor: add new watchman notifications to fsmonitor extension
https://www.mercurial-scm.org/repo/hg/rev/60213a2eca81
changeset: 34566:60213a2eca81
bookmark: @
tag: tip
user: Jun Wu <quark at fb.com>
date: Thu Oct 05 13:38:48 2017 -0700
summary: patch: do not cache translated messages (API)
--
Repository URL: https://www.mercurial-scm.org/repo/hg
More information about the Mercurial-devel
mailing list