D401: filemerge: add `_workingpath`

2017-09-05 Thread singhsrb (Saurabh Singh)
singhsrb updated this revision to Diff 1627. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D401?vs=1513=1627 REVISION DETAIL https://phab.mercurial-scm.org/D401 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git

D401: filemerge: add `_workingpath`

2017-08-31 Thread phillco (Phil Cohen)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG7558917f291e: filemerge: add `_workingpath` (authored by phillco). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D401?vs=1503=1513#toc REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D401: filemerge: add `_workingpath`

2017-08-31 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 1503. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D401?vs=1488=1503 REVISION DETAIL https://phab.mercurial-scm.org/D401 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D401: filemerge: add `_workingpath`

2017-08-31 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > phillco wrote in filemerge.py:724 > you're right. I'll make that change in the morning. It's now past morning (in our timezone) :-) But don't worry, I'll fix this in flight. REPOSITORY rHG Mercurial REVISION DETAIL

D401: filemerge: add `_workingpath`

2017-08-31 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 1481. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D401?vs=1456=1481 REVISION DETAIL https://phab.mercurial-scm.org/D401 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D401: filemerge: add `_workingpath`

2017-08-31 Thread phillco (Phil Cohen)
phillco abandoned this revision. phillco added inline comments. INLINE COMMENTS > martinvonz wrote in filemerge.py:724 > should "a" be renamed to "unused" here? you're right. I'll make that change in the morning. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D401

D401: filemerge: add `_workingpath`

2017-08-31 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > filemerge.py:724 > fd = fcd.path() > a, unused, unused, back = files > should "a" be renamed to "unused" here? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D401 To: phillco, #hg-reviewers Cc:

D401: filemerge: add `_workingpath`

2017-08-30 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 1456. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D401?vs=1310=1456 REVISION DETAIL https://phab.mercurial-scm.org/D401 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D401: filemerge: add `_workingpath`

2017-08-25 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 1310. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D401?vs=1306=1310 REVISION DETAIL https://phab.mercurial-scm.org/D401 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D401: filemerge: add `_workingpath`

2017-08-25 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 1306. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D401?vs=1223=1306 REVISION DETAIL https://phab.mercurial-scm.org/D401 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D401: filemerge: add `_workingpath`

2017-08-23 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 1223. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D401?vs=911=1223 REVISION DETAIL https://phab.mercurial-scm.org/D401 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D401: filemerge: add `_workingpath`

2017-08-14 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 911. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D401?vs=910=911 REVISION DETAIL https://phab.mercurial-scm.org/D401 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D401: filemerge: add `_workingpath`

2017-08-14 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 910. phillco edited the summary of this revision. phillco retitled this revision from "filemerge: reduce creation of tempfiles until needed" to "filemerge: add `_workingpath`". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE