From 2abf0ada4279cff1521b4ddbc5476abcd69f6057 Mon Sep 17 00:00:00 2001 From: Jun Wu Date: Tue, 15 Sep 2020 21:02:09 -0700 Subject: [PATCH] version: print EdenSCM instead of Mercurial Summary: Per team discussion. Reviewed By: singhsrb Differential Revision: D23719401 fbshipit-source-id: a1e9a1e9a10369c307413354054a65e6520d13e5 --- eden/scm/lib/hgcommands/src/commands/version.rs | 11 +---------- eden/scm/tests/test-hgrc.t | 7 +------ 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/eden/scm/lib/hgcommands/src/commands/version.rs b/eden/scm/lib/hgcommands/src/commands/version.rs index 117a01a84a..2b010ef616 100644 --- a/eden/scm/lib/hgcommands/src/commands/version.rs +++ b/eden/scm/lib/hgcommands/src/commands/version.rs @@ -10,16 +10,7 @@ use super::Result; use super::IO; pub fn run(_opts: NoOpts, io: &mut IO) -> Result { - io.write(format!( - r#"Mercurial Distributed SCM (version {}) -(see https://mercurial-scm.org for more information) - -Copyright (C) 2005-2017 Matt Mackall and others -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -"#, - ::version::VERSION - ))?; + io.write(format!("EdenSCM {}\n", ::version::VERSION))?; Ok(0) } diff --git a/eden/scm/tests/test-hgrc.t b/eden/scm/tests/test-hgrc.t index e7bd1aef98..8cdb7ceb4b 100644 --- a/eden/scm/tests/test-hgrc.t +++ b/eden/scm/tests/test-hgrc.t @@ -82,12 +82,7 @@ issue1829: wrong indentation $ export FAKEPATH $ echo '%include $FAKEPATH/no-such-file' > $HGRC $ hg version - Mercurial Distributed SCM (version *) (glob) - (see https://mercurial-scm.org for more information) - - Copyright (C) 2005-* Matt Mackall and others (glob) - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + EdenSCM * (glob) $ unset FAKEPATH make sure global options given on the cmdline take precedence