Part of bzrlib

Display what revisions are missing in 'other' from 'this' and vice versa.

Function | iter_log_revisions | Undocumented |

Function | find_unmerged | Find revisions from each side that have not been merged. |

Function | sorted_revisions | Undocumented |

Function | _enumerate_mainline | Enumerate the mainline revisions for these revisions. |

Function | _enumerate_with_merges | Enumerate the revisions for the ancestry. |

Function | _filter_revs | Undocumented |

Function | _find_unmerged | See find_unmerged. |

def
find_unmerged(local_branch, remote_branch, restrict='all', include_merged=None, backward=False, local_revid_range=None, remote_revid_range=None, include_merges=symbol_versioning.DEPRECATED_PARAMETER):

Find revisions from each side that have not been merged.

Parameters | local_branch | Compare the history of local_branch |

remote_branch | versus the history of remote_branch, and determine mainline revisions which have not been merged. | |

restrict | ('all', 'local', 'remote') If 'all', we will return the unique revisions from both sides. If 'local', we will return None for the remote revisions, similarly if 'remote' we will return None for the local revisions. | |

include_merged | Show mainline revisions only if False, all revisions otherwise. | |

backward | Show oldest versions first when True, newest versions first when False. | |

local_revid_range | Revision-id range for filtering local_branch revisions (lower bound, upper bound) | |

remote_revid_range | Revision-id range for filtering remote_branch revisions (lower bound, upper bound) | |

include_merges | Deprecated historical alias for include_merged | |

Returns | A list of [(revno, revision_id)] for the mainline revisions on each side. |

def
_enumerate_mainline(ancestry, graph, tip_revno, tip, backward=True):

Enumerate the mainline revisions for these revisions.

Parameters | ancestry | A set of revisions that we care about |

graph | A Graph which lets us find the parents for a revision | |

tip_revno | The revision number for the tip revision | |

tip | The tip of mainline | |

backward | Show oldest versions first when True, newest versions first when False. | |

Returns | [(revno, revision_id)] for all revisions in ancestry that are left-hand parents from tip, or None if ancestry is None. |

def
_enumerate_with_merges(branch, ancestry, graph, tip_revno, tip, backward=True):

Enumerate the revisions for the ancestry.

Parameters | branch | The branch we care about |

ancestry | A set of revisions that we care about | |

graph | A Graph which lets us find the parents for a revision | |

tip_revno | The revision number for the tip revision | |

tip | The tip of the ancsetry | |

backward | Show oldest versions first when True, newest versions first when False. | |

Returns | [(revno, revision_id)] for all revisions in ancestry that are parents from tip, or None if ancestry is None. |