Commit Graph

6 Commits

Author SHA1 Message Date
Wez Furlong
628f88d82d hgext: refactor D123 parsing, centralize
Summary:
In addition to being duplicated between these places,
I'd like to re-use this elsewhere.

Test Plan: run-tests continues to pass

Reviewers: #sourcecontrol, ttung, ikostia

Reviewed By: ikostia

Subscribers: mjpieters

Differential Revision: https://phabricator.intern.facebook.com/D3230128

Tasks: 11013909

Signature: t1:3230128:1461775513:6fc79fda68cd15ded7fb11d52024b5aab56ee880
2016-04-27 09:50:13 -07:00
Adam Simpkins
db56b7802d [pullcreatemarkers] also obsolete parents of commits landed in this pull
Summary:
When a pull causes commits on the tip of a branch to be obsoleted due to
landing, make sure that parent commits that were landed in previous pulls also
get hidden.  The parent commits would already have obsolete markers, but they
would have been inhibited because there were non-obsolete children.  Once their
children are landed their obsolete markers can now be deinhibited.

Test Plan: Added a new test case.

Reviewers: #sourcecontrol, durham, lcharignon, ikostia, pyd, ttung

Subscribers: net-systems-diffs@, yogeshwer, mjpieters

Differential Revision: https://phabricator.fb.com/D3028597
2016-03-21 18:08:04 -07:00
Adam Simpkins
3a980ca96a [pullcreatemarkers] fix issues creating obsolescence markers
Summary:
Use a transaction, to make sure commits get hidden properly.  Currently it
fails to hide all commits if multiple commits on the same branch are all
obsoleted in the same pull.  When creating obsolescence markers for some of the
earlier commits, it thinks they still have non-hidden successors, and doesn't
know that these successors are also going to be hidden by the same pull
operation.

Also avoid walking all draft commits if nothing new was landed in this pull.

Test Plan:
Updated the tests to exercise the case where a pull obsoletes multiple commits
all at the tip of a branch.

Reviewers: #sourcecontrol, lcharignon, ikostia, durham, ttung

Reviewed By: durham

Subscribers: durham, net-systems-diffs@, yogeshwer, mjpieters

Differential Revision: https://phabricator.fb.com/D3013783

Signature: t1:3013783:1457136740:cbcd0220e82d044d25a34692793e70f5be61d63e
2016-03-04 16:28:58 -08:00
Kostia Balytskyi
7c83af7183 pullcreatemarkers: don't create unnecessary metadata
Differential Revision: https://phabricator.fb.com/D2948852
2016-02-18 06:50:46 -08:00
Kostia Balytskyi
c32c5f4b4c pullcreatemarkers: add landed attribute to markers
Summary:
Further goal is to make smartlog be able to display "landed as smth"
near local commits that has been landed. smth may be either the hash
of public rebased commit pulled from server or a phabricator diff id.

Differential Revision: https://phabricator.fb.com/D2908465
2016-02-08 09:54:52 -08:00
Laurent Charignon
4502578fbf pullcreatemarkers: add a new extension to create markers on pull
Summary:
The goal of this extensions is to create obsolescence markers locally for
commits previously landed.
It uses the phabricator revision number in the commit message to detect the
relationship between a draft commit and its landed counterpart.
Thanks to these markers, less information is displayed and rebases can have
less irrelevant conflicts.

Test Plan: Added a new test

Reviewers: pyd, ericsumner, durham

Differential Revision: https://phabricator.fb.com/D2665923
2015-12-10 10:31:47 -08:00