Struct Diverged 

pub struct Diverged {
    pub branch: String,
    pub remote: String,
    pub local_tip: String,
    pub origin_tip: String,
    pub local_only: Vec<Commit>,
    pub origin_only: Vec<Commit>,
    pub reason: String,
}

A divergence magi could not settle by itself.

Fields

branch: String

Branch name.

remote: String

Remote name.

local_tip: String

Local tip sha.

origin_tip: String

Remote tip sha.

local_only: Vec<Commit>

Commits only the local branch has that no origin commit repeats.

origin_only: Vec<Commit>

Commits only the remote has that no local commit repeats.

reason: String

Why this was not a plain rebase.

Implementations

impl Diverged

pub fn summary(&self) -> String

The one line the operator sees first. Stable for a branch and remote: Choice::from_answer callers match the recorded answer to it.

pub fn choices(&self) -> Vec<String>

The two answers a person may give. Each carries the tips the question showed, so applying one can refuse if either side has moved since.

pub fn detail(&self) -> String

Both sides, what each holds, and what choosing the other loses.

Trait Implementations

impl Clone for Diverged

fn clone(&self) -> Self

Returns a duplicate of the value.

fn clone_from(&mut self, source: &Self)

Performs copy-assignment from source.

impl Debug for Diverged

fn fmt(&self, f: &mut Formatter<'_>) -> Result

Formats the value using the given formatter.

impl Display for Diverged

fn fmt(&self, f: &mut Formatter<'_>) -> Result

Formats the value using the given formatter.

impl Error for Diverged

fn source(&self) -> Option<&(dyn Error + 'static)>

Returns the lower-level source of this error, if any.

fn description(&self) -> &str

👎Deprecated since 1.42.0:

use the Display impl or to_string()

fn cause(&self) -> Option<&dyn Error>

👎Deprecated since 1.33.0:

replaced by Error::source, which can support downcasting

fn provide<'a>(&'a self, request: &mut Request<'a>)

🔬This is a nightly-only experimental API. (error_generic_member_access)

Provides type-based access to context intended for error reports.