Closed Bug 1217861 Opened 10 years ago Closed 8 years ago

Add option to squash commits together on push

Categories

(MozReview Graveyard :: General, defect)

Product:
MozReview Graveyard
Component:
General
Type:
defect
Priority:
Not set
Severity:
normal

Tracking

(Not tracked)

Status:
RESOLVED WONTFIX

People

(Reporter: smacleod, Assigned: glob)

Details

User Story

add hgrc option and command line switch to enable squash-on-review.

this will perform a client-side squash, push to reviewboard, then delete the local branch/evidence (the deletion can be prevented with another option/switch).

given:
  (A)->(B)->[C]->[D]->[E]
where commits C, D, and E need to be pushed for review.

1. hg checkout B
2. hg export -r C..E --git | hg import --no-commit -
3. hg commit
4. hg push $review-url -c .
5. hg prune .
6. hg checkout E
One way to handle workflows where the author creates a number of "fixup" commits and expects the reviewer to view the parent/squashed diff is to add an option for squashing your push into a single commit for review. We could provide an hgrc configuration for this / prompt the user when pushing.
Assignee: nobody → glob
Product: Developer Services → MozReview
User Story: (updated)
User Story: (updated)
mozreview is going away – wontfix'ing
Status: NEW → RESOLVED
Closed: 8 years ago
Resolution: --- → WONTFIX
You need to log in before you can comment on or make changes to this bug.