diff options
| author | Matthias Beyer <mail@beyermatthias.de> | 2016-07-16 22:40:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-16 22:40:48 +0200 |
| commit | 29d10361b3b3cb679a29d0de462b65442a835af1 (patch) | |
| tree | 924336f58ff3cdd2b7c83545a892f20f57a9379b | |
| parent | 48950b61759c208a005aafdef1b71dcc19a5f941 (diff) | |
| parent | 2646894bd36f6889715957515ea7488523e45843 (diff) | |
Merge pull request #555 from matthiasbeyer/imag-view/fixes
Imag view/fixes
| -rw-r--r-- | imag-view/src/main.rs | 5 | ||||
| -rw-r--r-- | imag-view/src/ui.rs | 2 | ||||
| -rw-r--r-- | imag-view/src/viewer/stdout.rs | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/imag-view/src/main.rs b/imag-view/src/main.rs index 2fa7802b..16cc0b91 100644 --- a/imag-view/src/main.rs +++ b/imag-view/src/main.rs @@ -52,6 +52,11 @@ fn main() { let entry_id = rt.cli().value_of("id").unwrap(); // enforced by clap + if entry_id.contains("~") { + error!("The --id argument does not need the version part"); + exit(1); + } + if rt.cli().is_present("versions") { if let Err(e) = view_versions_of(entry_id, &rt) { trace_error(&e); diff --git a/imag-view/src/ui.rs b/imag-view/src/ui.rs index 54979f1f..45c05ed1 100644 --- a/imag-view/src/ui.rs +++ b/imag-view/src/ui.rs @@ -14,7 +14,7 @@ pub fn build_ui<'a>(app: App<'a, 'a>) -> App<'a, 'a> { .long("version") .short("V") .takes_value(true) - .required(false) + .required(true) .help("View this version (youngest if not specified)") .value_name("VERSION")) diff --git a/imag-view/src/viewer/stdout.rs b/imag-view/src/viewer/stdout.rs index a42af1c1..18536da6 100644 --- a/imag-view/src/viewer/stdout.rs +++ b/imag-view/src/viewer/stdout.rs @@ -24,6 +24,7 @@ impl Viewer for StdoutViewer { } if vi.view_header { + debug!("Going to display header: {:?}", vi.entry.get_header().header()); println!("{}", encode_str(vi.entry.get_header().header())); } |